From 92f1fc3f946c07a6a160b94a07f982c284a2071b Mon Sep 17 00:00:00 2001 From: Ward from fusion-voyager-3 Date: Tue, 5 Nov 2024 18:57:48 +0300 Subject: [PATCH] Try noninteractive --- .github/release-nest-v3 | 2 +- Makefile | 10 +++++++--- data/apt_full_upgrade | 3 +++ data/apt_update | 1 + debian/changelog | 2 +- debian/rules | 3 ++- 6 files changed, 15 insertions(+), 6 deletions(-) create mode 100644 data/apt_full_upgrade diff --git a/.github/release-nest-v3 b/.github/release-nest-v3 index 8fdd954..b393560 100644 --- a/.github/release-nest-v3 +++ b/.github/release-nest-v3 @@ -1 +1 @@ -22 \ No newline at end of file +23 \ No newline at end of file diff --git a/Makefile b/Makefile index 62187dc..11ec59e 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,10 @@ install: cp -vf data/flatpak-installer $(DESTDIR)/usr/bin/ cp -vf data/software-properties-gtk $(DESTDIR)/usr/bin/ # cp -vf target/release/apt_update $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ +# cp -vf target/release/apt_full_upgrade $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ cp -vf data/apt_update $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ - cp -vf target/release/apt_full_upgrade $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ + cp -vf target/release/apt_full_upgrade $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/apt_full_upgrade_bin + cp -vf data/apt_full_upgrade $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ cp -vf data/modify_repo.sh $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ cp -vf data/*.gschema.xml $(DESTDIR)/usr/share/glib-2.0/schemas/ cp -vf data/com.github.pikaos-linux.pikmanupdatemanager.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/ @@ -42,9 +44,11 @@ install_no_build_debug: cp -vf data/pikman-update-manager-autostart $(DESTDIR)/usr/bin/ cp -vf data/flatpak-installer $(DESTDIR)/usr/bin/ cp -vf data/software-properties-gtk $(DESTDIR)/usr/bin/ -# cp -vf target/debug/apt_update $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ +# cp -vf target/release/apt_update $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ +# cp -vf target/release/apt_full_upgrade $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ cp -vf data/apt_update $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ - cp -vf target/debug/apt_full_upgrade $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ + cp -vf target/release/apt_full_upgrade $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/apt_full_upgrade_bin + cp -vf data/apt_full_upgrade $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ cp -vf data/modify_repo.sh $(DESTDIR)/usr/lib/pika/pikman-update-manager/scripts/ cp -vf data/*.gschema.xml $(DESTDIR)/usr/share/glib-2.0/schemas/ cp -vf data/com.github.pikaos-linux.pikmanupdatemanager.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/ diff --git a/data/apt_full_upgrade b/data/apt_full_upgrade new file mode 100644 index 0000000..9f280c1 --- /dev/null +++ b/data/apt_full_upgrade @@ -0,0 +1,3 @@ +#! /bin/bash +DEBIAN_FRONTEND=noninteractive +/usr/lib/pika/pikman-update-manager/scripts/apt_full_upgrade_bin "$@" \ No newline at end of file diff --git a/data/apt_update b/data/apt_update index 682d3d2..2e792e4 100644 --- a/data/apt_update +++ b/data/apt_update @@ -1,2 +1,3 @@ #! /bin/bash +DEBIAN_FRONTEND=noninteractive apt-get update -y \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index c7c4621..ecc7091 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -pikman-update-manager (1.1.1-100pika1) pika; urgency=medium +pikman-update-manager (1.1.1-100pika2) pika; urgency=medium * add main page diff --git a/debian/rules b/debian/rules index a8d38b9..3bb24c0 100755 --- a/debian/rules +++ b/debian/rules @@ -28,7 +28,8 @@ override_dh_auto_install: cp -vf data/flatpak-installer debian/pikman-update-manager/usr/bin/ cp -vf data/software-properties-gtk debian/pikman-update-manager/usr/bin/ cp -vf data/apt_update debian/pikman-update-manager/usr/lib/pika/pikman-update-manager/scripts/ - cp -vf target/release/apt_full_upgrade debian/pikman-update-manager/usr/lib/pika/pikman-update-manager/scripts/ + cp -vf target/release/apt_full_upgrade debian/pikman-update-manager/usr/lib/pika/pikman-update-manager/scripts/apt_full_upgrade_bin + cp -vf data/apt_full_upgrade debian/pikman-update-manager/usr/lib/pika/pikman-update-manager/scripts/ cp -vf data/modify_repo.sh debian/pikman-update-manager/usr/lib/pika/pikman-update-manager/scripts/ cp -vf data/*.gschema.xml debian/pikman-update-manager/usr/share/glib-2.0/schemas/ cp -vf data/com.github.pikaos-linux.pikmanupdatemanager.svg debian/pikman-update-manager/usr/share/icons/hicolor/scalable/apps/