ephase/debian-updater
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Make spellcheck happy

Browse source
This commit is contained in:
Yorick Barbanneau 2020-04-18 16:45:48 +02:00
parent 11da7972db
commit 97a97d56e8
1 changed files with 29 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

54
install.sh
View file

@ -12,40 +12,41 @@ source lib/download.sh
source conf/init.sh source conf/init.sh
#Variables override #Variables override
for i in $(ls conf/*.conf) for i in conf/*
do do
source $i source "$i"
done done
erase_display_char () { erase_display_char () {
let "i=0" local i
while [ $i -lt $1 ]; do i=0
while [ "$i" -lt "$1" ]; do
message "\b \b" message "\b \b"
let "i=$i + 1" (( i=i + 1 ))
done done
} }
install () { install () {
nchar=0 nchar=0
message "\nInstall $1 : " message "\nInstall $1 : "
LC_ALL=C apt-get install --no-install-recommends -y $1 2>/dev/null | while read x; do LC_ALL=C apt-get install --no-install-recommends -y "$1" 2>/dev/null | while read -r x; do
display="" display=""
pkg_name="" pkg_name=""
case $x in case $x in
Get*) Get*)
pkg_name=$(echo $x | awk '{ printf $5 }') pkg_name=$(echo "$x" | awk '{ printf $5 }')
display="downloading" display="downloading"
;; ;;
Unpack*) Unpack*)
pkg_name=$(echo $x | awk '{ printf $2 }') pkg_name=$(echo "$x" | awk '{ printf $2 }')
display="Unpacking" display="Unpacking"
;; ;;
*already*newest*) *already*newest*)
pkg_name=$(echo $x | awk '{ printf $1 }') pkg_name=$(echo "$x" | awk '{ printf $1 }')
display="Already Ins talled" display="Already Ins talled"
;; ;;
esac esac
if [ ! -z "$display" ] if [ -n "$display" ]
then then
display="$display $pkg_name" display="$display $pkg_name"
erase_display_char $nchar erase_display_char $nchar
@ -58,9 +59,9 @@ install () {
} }
process_package_file (){ process_package_file (){
for p in `cat $1 | grep '^[^#].*'` for p in $(cat "$1" | grep '^[^#].*')
do do
install $p install "$p"
done done
} }
@ -82,15 +83,15 @@ create_fusioninv_conf () {
} }
configure_drm(){ configure_drm(){
if [ -z "$(grep -o drm $INITRAMFS_CONF_FILE)" ] if grep -o drm "$INITRAMFS_CONF_FILE"
then then
cat "drm" >> $INITRAMFS_CONF_FILE cat "drm" >> "$INITRAMFS_CONF_FILE"
else else
message "DRM already done " "warn" message "DRM already done " "warn"
fi fi
if [ -z "$(grep -o $1 $INITRAMFS_CONF_FILE)" ] if grep -q "$1" "$INITRAMFS_CONF_FILE"
then then
cat "$1 modeset=1" >> $INITRAMFS_CONF_FILE cat "$1 modeset=1" >> "$INITRAMFS_CONF_FILE"
else else
message "$1 already done " "warn" message "$1 already done " "warn"
fi fi
@ -102,15 +103,19 @@ configure_grub (){
} }
configure_plymouth (){ configure_plymouth (){
local module=$(lsmod | grep -o "i915\|radeon" | head -1) local module
module=$(lsmod | grep -o "i915\|radeon" | head -1)
if [ ! "$module" == "" ] if [ ! "$module" == "" ]
then then
message "\nConfigure drm modules for $module : " message "\nConfigure drm modules for $module : "
configure_drm $module configure_drm "$module"
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" )
[[ -z $splash_enable ]] && configure_grub || message "Grub splash kernel option exist " "warn" local splash_enable
splash_enable=$(sed -rn 's/GRUB_CMDLINE_LINUX_DEFAULT=\"(.*)\"/\1/p' ${GRUB_DEFAULT_CONF_FILE} | grep -o "splash" )
if [ -z "$splash_enable" ]; then configure_grub; else message "Grub splash kernel option exist " "warn"; fi
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
@ -157,11 +162,4 @@ message "OK" "ok"
#remove interface file until NM use network #remove interface file until NM use network
rm -rf /etc/network/interfaces rm -rf /etc/network/interfaces
#add elementary theme exit 0
#mkdir -p /tmp/themes/
#cd /tmp/themes/
#download master.zip https://github.com/shimmerproject/elementary-xfce/archive/
#unzip master.zip > /dev/null
#mv elementary-xfce-master/* /usr/share/icons/
#rm -rf *