phga
/
fresh
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bugfixes

Browse Source
master
Toerd@iArch 6 years ago
parent 75b1bb68a3
commit e26c6e624f
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File

25
fresh.sh
Unescape View File

@ -95,7 +95,7 @@ install_manual() {
msd=$((msd+1)) msd=$((msd+1))
dialog --title "Manual packages" --infobox "Manual Package $msd/$ms\n\nInstalling: $1\n\n> $2 <" 0 0 dialog --title "Manual packages" --infobox "Manual Package $msd/$ms\n\nInstalling: $1\n\n> $2 <" 0 0
cd "$scriptdir/packages/$1" || exit cd "$scriptdir/packages/$1" || exit
make clean && make && make install && make clean&>> $logfile ; make clean && make && make install && make clean &>> $logfile ;
cd "/home/$uname" || exit cd "/home/$uname" || exit
} }
@ -177,31 +177,32 @@ add_after() {
# add_after "Color" 'tt="ILoveCandy"' "$HOME/test/pacman.conf" # add_after "Color" 'tt="ILoveCandy"' "$HOME/test/pacman.conf"
# add_after "Color" 'tt="ILoveCandy"' "$HOME/test/pacman.conf" # add_after "Color" 'tt="ILoveCandy"' "$HOME/test/pacman.conf"
sed -i '/'"$1"'/a '"$2"'' $3 sed -i '/'"$1"'/a '"$2"'' $3
# BUG adds the config bit even if it already exists
} }
add_xorg_conf() { add_xorg_conf() {
echo "Adding xorg conf\n\n" >> $logfile echo "Adding xorg conf\n\n" >> $logfile
cp "$scriptdir/etc/X11/xorg.conf.d/*" /etc/X11/xorg.conf.d/ >> $logfile cp $scriptdir/etc/X11/xorg.conf.d/* /etc/X11/xorg.conf.d/ &>> $logfile
} }
add_udev_rules() { add_udev_rules() {
echo "Adding udev rules\n\n" >> $logfile echo "Adding udev rules from $scriptdir into udev folder\n\n" >> $logfile
cp "$scriptdir/etc/udev/rules.d/*" /etc/udev/rules.d/ >> $logfile cp $scriptdir/etc/udev/rules.d/* /etc/udev/rules.d/ &>> $logfile
} }
add_pacman_hooks() { add_pacman_hooks() {
echo "Adding pacman hooks\n\n" >> $logfile echo "Adding pacman hooks\n\n" >> $logfile
mkdir -p /etc/pacman.d/hooks >> $logfile mkdir -p /etc/pacman.d/hooks >> $logfile
cp "$scriptdir/etc/pacman.d/hooks/*" /etc/pacman.d/hooks/ >> $logfile cp $scriptdir/etc/pacman.d/hooks/* /etc/pacman.d/hooks/ &>> $logfile
} }
set_pacman_config() { set_pacman_config() {
echo "Setting pacman conf\n\n" >> $logfile echo "Setting pacman conf\n\n" >> $logfile
pconf="/etc/pacman.conf" pconf="/etc/pacman.conf"
uncom "Color" $pconf >> $logfile uncom "Color" $pconf &>> $logfile
uncom "TotalDownload" $pconf >> $logfile uncom "TotalDownload" $pconf &>> $logfile
uncom "VerbosePkgLists" $pconf >> $logfile uncom "VerbosePkgLists" $pconf &>> $logfile
add_after "VerbosePkgLists" "ILoveCandy" $pconf >> $logfile add_after "VerbosePkgLists" "ILoveCandy" $pconf &>> $logfile
} }
set_git_config() { set_git_config() {
@ -215,15 +216,15 @@ set_system_stuff() {
# locale gen # locale gen
echo "Enter system stuff\n\n" >> $logfile echo "Enter system stuff\n\n" >> $logfile
dialog --title "Setting up the system" --infobox "Final adjustments" 0 0 dialog --title "Setting up the system" --infobox "Final adjustments" 0 0
localectl --no-convert set-x11-keymap us ,altgr-intl >> $logfile localectl --no-convert set-x11-keymap us ,altgr-intl &>> $logfile
setxkbmap us -variant altgr-intl >> $logfile setxkbmap us -variant altgr-intl &>> $logfile
add_udev_rules add_udev_rules
set_pacman_config set_pacman_config
add_pacman_hooks add_pacman_hooks
add_xorg_conf add_xorg_conf
set_git_config set_git_config
#link syncthing config and move certs #link syncthing config and move certs
sudo -u $uname /home/$uname/.dotfiles/syncthing/link-confs.sh sudo -u $uname /home/$uname/.dotfiles/syncthing/link-confs.sh &>> $logfile
echo "Leave system stuff\n\n" >> $logfile echo "Leave system stuff\n\n" >> $logfile
} }
# ACTUAL ROUTINE # ACTUAL ROUTINE

Write Preview
Loading…
Cancel
Save