diff --git a/fresh.sh b/fresh.sh index ff02b76..d01734c 100755 --- a/fresh.sh +++ b/fresh.sh @@ -20,8 +20,10 @@ repo=${repo:="https://toerd@bitbucket.org/toerd/dotfiles"} prog=${prog:="$HOME/install/pack.list"} aurhelper=${aurhelper:="yay"} logfile=${logfile:="$HOME/install/install.log"} +scriptdir=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) -if [ -z ${v+x} ]; then logfile="/dev/null" +if [ -z ${v+x} ]; then + logfile="/dev/null" fi startup_msg() { @@ -76,9 +78,9 @@ install_aur() { sudo -u $uname $aurhelper -S --noconfirm "$1" $>$logfile } -install_from_source() { +install_manual() { dialog --title "Manual packages" --infobox "Manual Package $n/$ms\n\nInstalling: $1\n\n> $2 <" 0 0 - cd "$1" || exit + cd "$scriptdir/packages/$1" || exit make clean && make && sudo -u $uname make install &>$logfile ; cd "/home/$uname" || exit } @@ -111,6 +113,7 @@ installation_loop() { case $prefix in P) install_pacman "$program" "$info" ;; A) install_aur "$program" "$info" ;; + M) install_manual "$program" "$info" ;; esac done < /tmp/pack.list }