From 18a33472251fc303c0762b4a6bd5ab29ad7e0d49 Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Sun, 19 Apr 2020 15:43:36 +0200 Subject: [PATCH 1/3] condition were inverted in configure_drm() --- install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install.sh b/install.sh index 33e09a6..dcbaa2e 100755 --- a/install.sh +++ b/install.sh @@ -83,17 +83,17 @@ create_fusioninv_conf () { } configure_drm(){ - if grep -o drm "$INITRAMFS_CONF_FILE" + if grep -q drm "$INITRAMFS_CONF_FILE" then - cat "drm" >> "$INITRAMFS_CONF_FILE" - else message "DRM already done " "warn" + else + cat "drm" >> "$INITRAMFS_CONF_FILE" fi if grep -q "$1" "$INITRAMFS_CONF_FILE" then - cat "$1 modeset=1" >> "$INITRAMFS_CONF_FILE" - else message "$1 already done " "warn" + else + cat "$1 modeset=1" >> "$INITRAMFS_CONF_FILE" fi } From 7409cc883c5c82c79e5880b34dfa1f21e7b01e3d Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Sun, 19 Apr 2020 15:45:04 +0200 Subject: [PATCH 2/3] Remove unecessary lines for repo --- install.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/install.sh b/install.sh index dcbaa2e..c2984bc 100755 --- a/install.sh +++ b/install.sh @@ -126,14 +126,6 @@ configure_plymouth (){ fi } -# rno need to install things from sid and backport in 10 -#message "\nAdd Debian stretch backport and Sid Repository :" -#cp ./files/apt/*.list /etc/apt/sources.list.d/ -#cp ./files/apt/20-stable /etc/apt/preferences.d/ -#cp ./files/apt/60-* /etc/apt/preferences.d/ -#cp ./files/apt/80-* /etc/apt/preferences.d/ -#message "done\n" "ok" -# apt-get update &>/dev/null process_package_file files/packages.list From 0062323e4d8f999bb77babc97abddc9fe6c450ef Mon Sep 17 00:00:00 2001 From: Yorick Barbanneau Date: Sun, 19 Apr 2020 15:48:03 +0200 Subject: [PATCH 3/3] Remove unecessary files for apt --- files/apt/10.stretch_backport.list | 1 - files/apt/20-stable | 7 ------- files/apt/20.sid.list | 1 - files/apt/60-libreoffice | 3 --- files/apt/60-remmina | 3 --- files/apt/80-fusioninventory | 3 --- files/apt/80-papirus-icon-theme | 3 --- 7 files changed, 21 deletions(-) delete mode 100644 files/apt/10.stretch_backport.list delete mode 100644 files/apt/20-stable delete mode 100644 files/apt/20.sid.list delete mode 100644 files/apt/60-libreoffice delete mode 100644 files/apt/60-remmina delete mode 100644 files/apt/80-fusioninventory delete mode 100644 files/apt/80-papirus-icon-theme diff --git a/files/apt/10.stretch_backport.list b/files/apt/10.stretch_backport.list deleted file mode 100644 index e988ba7..0000000 --- a/files/apt/10.stretch_backport.list +++ /dev/null @@ -1 +0,0 @@ -deb http://deb.debian.org/debian stretch-backports main contrib non-free diff --git a/files/apt/20-stable b/files/apt/20-stable deleted file mode 100644 index 01cd7cb..0000000 --- a/files/apt/20-stable +++ /dev/null @@ -1,7 +0,0 @@ -Package: * -Pin:release n=sid -Pin-Priority:-10 - -Package: * -Pin:release n=stretch-backport -Pin-Priority:-10 diff --git a/files/apt/20.sid.list b/files/apt/20.sid.list deleted file mode 100644 index c0bba96..0000000 --- a/files/apt/20.sid.list +++ /dev/null @@ -1 +0,0 @@ -deb http://ftp.debian.org/debian sid main diff --git a/files/apt/60-libreoffice b/files/apt/60-libreoffice deleted file mode 100644 index 2ac3c54..0000000 --- a/files/apt/60-libreoffice +++ /dev/null @@ -1,3 +0,0 @@ -Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr -Pin: release n=stretch-backports -Pin-Priority: 991 diff --git a/files/apt/60-remmina b/files/apt/60-remmina deleted file mode 100644 index f15a097..0000000 --- a/files/apt/60-remmina +++ /dev/null @@ -1,3 +0,0 @@ -Package: remmina remmina-plugin-rdp -in: release n=stretch-backports -Pin-Priority: 991 diff --git a/files/apt/80-fusioninventory b/files/apt/80-fusioninventory deleted file mode 100644 index 733b9b8..0000000 --- a/files/apt/80-fusioninventory +++ /dev/null @@ -1,3 +0,0 @@ -Package: fusioninventory-agent -Pin: release n=sid -Pin-Priority: 991 diff --git a/files/apt/80-papirus-icon-theme b/files/apt/80-papirus-icon-theme deleted file mode 100644 index f1f69ee..0000000 --- a/files/apt/80-papirus-icon-theme +++ /dev/null @@ -1,3 +0,0 @@ -Package: papirus-icon-theme -Pin: release n=sid -Pin-Priority: 991