diff --git a/installer.sh b/installer.sh index abc7c91..82f2190 100644 --- a/installer.sh +++ b/installer.sh @@ -11,16 +11,15 @@ update_alpine(){ } apk_install(){ - echo "installing $1"; doas apk add "$1" >/dev/null 2>&1 + doas apk add "$1" >/dev/null 2>&1; echo "installing $1" } -bwapk_install (){ - echo "installing $1 on chroot environment" - doas bwroot apk add "$1" >/dev/null 2>&1 +bwapk_install (){ + doas bwroot apk add "$1" >/dev/null 2>&1; echo "installing $1 on chroot environment" } git_install(){ - echo "cloning from $1"; cd $HOME/.local/src/; git clone \"$1\" >/dev/null 2>&1 + cd $HOME/.local/src/; git clone "$1" >/dev/null 2>&1; echo "cloning from $1"; } read_software(){ @@ -29,9 +28,9 @@ read_software(){ tail -n +2 "/tmp/temp.csv" | sed -E ':a; s/("[^"]*),([^"]*")/\1\2/; ta' | while IFS=',' read -r NAME DESCRIPTION GIT GIT_URL; do case "$GIT" in - "N") apk_install $NAME ;; + "N") apk_install "$NAME" ;; "Y") git_install "$GIT_URL" ;; - "D") bwapk_install $NAME ;; + "D") bwapk_install "$NAME" ;; *) echo "ERROR: failed to determine $NAME."; exit 1 ;; esac done @@ -75,10 +74,10 @@ setup_home(){ xdg-user-dirs-update doas apk add git printf "Deploying dotfiles...\n" - git clone --recursive $dotfiles + git clone --recursive $dotfiles >/dev/null 2>&1 cd dotfiles rm -rf .git .gitmodules - cp -r .cache .config .zprofile $HOME + cp -r .config .zprofile $HOME cp -r .local/* $HOME/.local/ cd $HOME rm -rf dotfiles/