diff --git a/files/apt/10.stretch_backport.list b/files/apt/10.stretch_backport.list new file mode 100644 index 0000000..e988ba7 --- /dev/null +++ b/files/apt/10.stretch_backport.list @@ -0,0 +1 @@ +deb http://deb.debian.org/debian stretch-backports main contrib non-free diff --git a/files/apt/20-stable b/files/apt/20-stable new file mode 100644 index 0000000..01cd7cb --- /dev/null +++ b/files/apt/20-stable @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..c0bba96 --- /dev/null +++ b/files/apt/20.sid.list @@ -0,0 +1 @@ +deb http://ftp.debian.org/debian sid main diff --git a/files/apt/60-libreoffice b/files/apt/60-libreoffice new file mode 100644 index 0000000..2ac3c54 --- /dev/null +++ b/files/apt/60-libreoffice @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..f15a097 --- /dev/null +++ b/files/apt/60-remmina @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..733b9b8 --- /dev/null +++ b/files/apt/80-fusioninventory @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000..f1f69ee --- /dev/null +++ b/files/apt/80-papirus-icon-theme @@ -0,0 +1,3 @@ +Package: papirus-icon-theme +Pin: release n=sid +Pin-Priority: 991 diff --git a/install.sh b/install.sh index c2984bc..33e09a6 100755 --- a/install.sh +++ b/install.sh @@ -83,17 +83,17 @@ create_fusioninv_conf () { } configure_drm(){ - if grep -q drm "$INITRAMFS_CONF_FILE" + if grep -o drm "$INITRAMFS_CONF_FILE" then - message "DRM already done " "warn" - else cat "drm" >> "$INITRAMFS_CONF_FILE" + else + message "DRM already done " "warn" fi if grep -q "$1" "$INITRAMFS_CONF_FILE" then - message "$1 already done " "warn" - else cat "$1 modeset=1" >> "$INITRAMFS_CONF_FILE" + else + message "$1 already done " "warn" fi } @@ -126,6 +126,14 @@ 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