diff --git a/install/apps/internet/webbrowser b/install/apps/internet/webbrowser index 2f3f56f..5ebf896 100644 --- a/install/apps/internet/webbrowser +++ b/install/apps/internet/webbrowser @@ -10,6 +10,7 @@ options+=("flashplugin" "" off) options+=("freshplayerplugin-git" "(AUR) Recommended" off) options+=("freshplayerplugin" "(AUR)" off) options+=("opera" "" off) +options+=("seamonkey" "" off) options+=("midori" "" off) options+=("midori-gtk2" "" off) options+=("qupzilla" "" off) @@ -37,6 +38,7 @@ instpkg "$pkg" "$aurpkg" for itm in $sel; do case $itm in '"firefox"') choosepkg "firefox-i18n-";; + '"seamonkey"') chooseaurpkg "seamonkey-i18n-";; esac done diff --git a/lib b/lib index ade849a..8911aac 100644 --- a/lib +++ b/lib @@ -94,6 +94,39 @@ choosepkg(){ } +# $1: string +# $2: [title] +chooseaurpkg(){ + if [ "$2" = "" ]; then + title=$1 + else + title=$2 + fi + options=() + if [ -f /usr/bin/yaourt ]; then + items=$(yaourt -Ssq $1) + else + if [ -f /usr/bin/packer ]; then + items=$(packer -Ssq $1) + fi + fi + for item in $items; do + options+=("$item" "" off) + done + sel=$(whiptail --backtitle "$apptitle" --title "$title" --checklist "" --cancel-button "Back" 0 0 0 \ + "${options[@]}" \ + 3>&1 1>&2 2>&3) + if [ ! "$?" = "0" ]; then + exit 1 + fi + for itm in $sel; do + aurpkg="$aurpkg $(echo $itm | sed 's/"//g')" + done + instpkg "$pkg" "$aurpkg" + exit 0 +} + + # $1: path # $2: chmod require(){