Merge branch 'master' into acaqb

This commit is contained in:
Yorick Barbanneau 2018-05-02 10:47:40 +02:00
commit 8b3483e411
3 changed files with 6 additions and 7 deletions

View file

@ -1,3 +1,3 @@
Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr Package: libreoffice libreoffice-gtk3 libreoffice-l10n-fr
in: release n=stretch-backport in: release n=stretch-backports
Pin-Priority: 991 Pin-Priority: 991

View file

@ -1,3 +1,3 @@
Package: remmina remmina-plugin-rdp Package: remmina remmina-plugin-rdp
in: release n=stretch-backport in: release n=stretch-backports
Pin-Priority: 991 Pin-Priority: 991

View file

@ -111,7 +111,7 @@ configure_plymouth (){
message "done" "ok" message "done" "ok"
message "\nConfigure grub command line : " message "\nConfigure grub command line : "
local splash_enable=$(sed -rn 's/GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/\1/p' ${GRUB_DEFAULT_CONF_FILE} | grep -o "splash" ) local splash_enable=$(sed -rn 's/GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/\1/p' ${GRUB_DEFAULT_CONF_FILE} | grep -o "splash" )
[[ -z $spash_enable ]] && configure_grub || message "Grub spash kernel option exist " "warn" [[ -z $splash_enable ]] && configure_grub || message "Grub splash kernel option exist " "warn"
message "done" "ok" message "done" "ok"
message "\nSelect plymouth theme : " message "\nSelect plymouth theme : "
plymouth-set-default-theme -R spinner &>/dev/null plymouth-set-default-theme -R spinner &>/dev/null
@ -123,11 +123,10 @@ configure_plymouth (){
} }
message "\nAdd Debian stretch backport and Sid Repository :" message "\nAdd Debian stretch backport and Sid Repository :"
cp ./files/apt/10.stretch_backport.list /etc/apt/sources.list.d/ cp ./files/apt/*.list /etc/apt/sources.list.d/
cp ./files/apt/20.sid.list /etc/apt/sources.list.d/
cp ./files/apt/20-stable /etc/apt/preferences.d/ cp ./files/apt/20-stable /etc/apt/preferences.d/
cp ./files/apt/80-fusioninventory /etc/apt/preferences.d/ cp ./files/apt/60-* /etc/apt/preferences.d/
cp ./files/apt/80-papirus-icon-theme /etc/apt/preferences.d/ cp ./files/apt/80-* /etc/apt/preferences.d/
message "done\n" "ok" message "done\n" "ok"