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

Fixed typos, now all funcs actually getting called

Browse Source
This commit is contained in:
toerd 2018-11-17 21:24:06 +01:00
parent b9623862a4
commit d85b848588
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fresh.sh
View File

@ -1,10 +1,11 @@
#!/bin/bash #!/bin/bash
# TODO: localegen etc
scriptdir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) scriptdir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
logfile="/dev/null" logfile="/dev/null"
todo="install" todo="install"
# Get params # Get params
while getopts "r:p:d:vuh" opt; while getopts "r:p:d:vuh" opt;
do case $opt in do case $opt in
@ -179,28 +180,35 @@ add_after() {
} }
add_udev_rules() { add_udev_rules() {
cp "$scriptdir/udev/*" /etc/udev/rules.d/ echo "Adding udev rules\n\n" >> $logfile
cp "$scriptdir/udev/*" /etc/udev/rules.d/ >> $logfile
} }
add_pacman_hooks() { add_pacman_hooks() {
mkdir -p /etc/pacman.d/hooks echo "Adding pacman hooks\n\n" >> $logfile
cp "$scriptdir/pacman/hooks/*" /etc/pacman.d/hooks/ mkdir -p /etc/pacman.d/hooks >> $logfile
cp "$scriptdir/pacman/hooks/*" /etc/pacman.d/hooks/ >> $logfile
} }
set_pacman_config() { set_pacman_config() {
echo "Setting pacman conf\n\n" >> $logfile
pconf="/etc/pacman.conf" pconf="/etc/pacman.conf"
uncom "Color" $pconf uncom "Color" $pconf >> $logfile
uncom "TotalDownload" $pconf uncom "TotalDownload" $pconf >> $logfile
uncom "VerbosePkgLists" $pconf uncom "VerbosePkgLists" $pconf >> $logfile
add_after "VerbosePkgLists" "ILoveCandy" $pconf add_after "VerbosePkgLists" "ILoveCandy" $pconf >> $logfile
} }
set_system_stuff() { set_system_stuff() {
# locale gen # locale gen
localectl --no-convert set-x11-keymap us ,altgr-intl echo "Enter system stuff\n\n" >> $logfile
setxkbmap us -variant altgr-intl dialog --title "Setting up the system" --infobox "Final adjustments" 0 0
set_pacman_conf localectl --no-convert set-x11-keymap us ,altgr-intl >> $logfile
setxkbmap us -variant altgr-intl >> $logfile
add_udev_rules add_udev_rules
set_pacman_config
add_pacman_hooks
echo "Leave system stuff\n\n" >> $logfile
} }
# ACTUAL ROUTINE # ACTUAL ROUTINE