Comment out some whiptail calls for debugging purposes
This commit is contained in:
parent
e9e38e74b0
commit
b0a71b5d9f
1 changed files with 10 additions and 10 deletions
20
larbs.sh
20
larbs.sh
|
@ -178,7 +178,7 @@ manualinstall() {
|
||||||
# Installs $1 manually. Used only for AUR helper here.
|
# Installs $1 manually. Used only for AUR helper here.
|
||||||
# Should be run after repodir is created and var is set.
|
# Should be run after repodir is created and var is set.
|
||||||
pacman -Qq "$1" && return 0
|
pacman -Qq "$1" && return 0
|
||||||
whiptail --infobox "Installing \"$1\" manually." 7 50
|
# whiptail --infobox "Installing \"$1\" manually." 7 50
|
||||||
sudo -u "$name" mkdir -p "$repodir/$1"
|
sudo -u "$name" mkdir -p "$repodir/$1"
|
||||||
sudo -u "$name" git -C "$repodir" clone --depth 1 --single-branch \
|
sudo -u "$name" git -C "$repodir" clone --depth 1 --single-branch \
|
||||||
--no-tags -q "https://aur.archlinux.org/$1.git" "$repodir/$1" ||
|
--no-tags -q "https://aur.archlinux.org/$1.git" "$repodir/$1" ||
|
||||||
|
@ -193,7 +193,7 @@ manualinstall() {
|
||||||
|
|
||||||
maininstall() {
|
maininstall() {
|
||||||
# Installs all needed programs from main repo.
|
# Installs all needed programs from main repo.
|
||||||
whiptail --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total). $1 $2" 9 70
|
# whiptail --title "LARBS Installation" --infobox "Installing \`$1\` ($n of $total). $1 $2" 9 70
|
||||||
installpkg "$1"
|
installpkg "$1"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -201,8 +201,8 @@ gitmakeinstall() {
|
||||||
progname="${1##*/}"
|
progname="${1##*/}"
|
||||||
progname="${progname%.git}"
|
progname="${progname%.git}"
|
||||||
dir="$repodir/$progname"
|
dir="$repodir/$progname"
|
||||||
whiptail --title "LARBS Installation" \
|
# whiptail --title "LARBS Installation" \
|
||||||
--infobox "Installing \`$progname\` ($n of $total) via \`git\` and \`make\`. $(basename "$1") $2" 8 70
|
# --infobox "Installing \`$progname\` ($n of $total) via \`git\` and \`make\`. $(basename "$1") $2" 8 70
|
||||||
sudo -u "$name" git -C "$repodir" clone --depth 1 --single-branch \
|
sudo -u "$name" git -C "$repodir" clone --depth 1 --single-branch \
|
||||||
--no-tags -q "$1" "$dir" ||
|
--no-tags -q "$1" "$dir" ||
|
||||||
{
|
{
|
||||||
|
@ -216,15 +216,15 @@ gitmakeinstall() {
|
||||||
}
|
}
|
||||||
|
|
||||||
aurinstall() {
|
aurinstall() {
|
||||||
whiptail --title "LARBS Installation" \
|
# whiptail --title "LARBS Installation" \
|
||||||
--infobox "Installing \`$1\` ($n of $total) from the AUR. $1 $2" 9 70
|
# --infobox "Installing \`$1\` ($n of $total) from the AUR. $1 $2" 9 70
|
||||||
echo "$aurinstalled" | grep -q "^$1$" && return 1
|
echo "$aurinstalled" | grep -q "^$1$" && return 1
|
||||||
sudo -u "$name" $aurhelper -S --noconfirm "$1" >/dev/null 2>&1
|
sudo -u "$name" $aurhelper -S --noconfirm "$1" >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
pipinstall() {
|
pipinstall() {
|
||||||
whiptail --title "LARBS Installation" \
|
# whiptail --title "LARBS Installation" \
|
||||||
--infobox "Installing the Python package \`$1\` ($n of $total). $1 $2" 9 70
|
# --infobox "Installing the Python package \`$1\` ($n of $total). $1 $2" 9 70
|
||||||
[ -x "$(command -v "pip")" ] || installpkg python-pip >/dev/null 2>&1
|
[ -x "$(command -v "pip")" ] || installpkg python-pip >/dev/null 2>&1
|
||||||
yes | pip install "$1"
|
yes | pip install "$1"
|
||||||
}
|
}
|
||||||
|
@ -279,8 +279,8 @@ refreshkeys ||
|
||||||
error "Error automatically refreshing Arch keyring. Consider doing so manually."
|
error "Error automatically refreshing Arch keyring. Consider doing so manually."
|
||||||
|
|
||||||
for x in curl ca-certificates base-devel git ntp zsh dash; do
|
for x in curl ca-certificates base-devel git ntp zsh dash; do
|
||||||
whiptail --title "LARBS Installation" \
|
# whiptail --title "LARBS Installation" \
|
||||||
--infobox "Installing \`$x\` which is required to install and configure other programs." 8 70
|
# --infobox "Installing \`$x\` which is required to install and configure other programs." 8 70
|
||||||
installpkg "$x"
|
installpkg "$x"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue