only $2 necessary for dialog message

This commit is contained in:
Luke Smith 2018-08-03 02:29:22 -04:00
parent acd2757bf4
commit bab6a2824f

View file

@ -72,7 +72,7 @@ adduserandpass() { \
gitmakeinstall() { gitmakeinstall() {
dir=$(mktemp -d) dir=$(mktemp -d)
dialog --title "LARBS Installation" --infobox "Installing \`$(basename $1)\` ($n of $total) via \`git\` and \`make\`. $(basename $1) ${@:2}." 5 70 dialog --title "LARBS Installation" --infobox "Installing \`$(basename $1)\` ($n of $total) via \`git\` and \`make\`. $(basename $1) $2." 5 70
git clone --depth 1 "$1" $dir &>/dev/null git clone --depth 1 "$1" $dir &>/dev/null
cd $dir cd $dir
make &>/dev/null make &>/dev/null
@ -80,12 +80,12 @@ gitmakeinstall() {
cd /tmp ;} cd /tmp ;}
maininstall() { # Installs all needed programs from main repo. maininstall() { # Installs all needed programs from main repo.
dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total). $1 ${@:2}." 5 70 dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total). $1 $2." 5 70
pacman --noconfirm --needed -S "$1" &>/dev/null pacman --noconfirm --needed -S "$1" &>/dev/null
} }
aurinstall() { \ aurinstall() { \
dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total) from the AUR. $1 ${@:2}." 5 70 dialog --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total) from the AUR. $1 $2." 5 70
grep "^$1$" <<< "$aurinstalled" && return grep "^$1$" <<< "$aurinstalled" && return
sudo -u $name $aurhelper -S --noconfirm "$1" &>/dev/null sudo -u $name $aurhelper -S --noconfirm "$1" &>/dev/null
} }