mirrors/sbopkg
2
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-11-12 21:10:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

merge patch from Erik Hanson; Erik's improvements include the echo statement when running the update list and the ability to retain the users place when navigating the various menus (i.e. will return to the same place in the menu); also add in argtable and libevent update fix per Erik's bug report

Browse Source
This commit is contained in:
chess.griffin 2008-08-11 02:02:11 +00:00
parent 63fb6ae94b
commit 57570758f8
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/usr/bin/sbopkg
View File

@ -27,10 +27,9 @@
# Linux is a registered trademark of Linus Torvalds. # Linux is a registered trademark of Linus Torvalds.
# #
# Other contributors: Bob Lounsbury, Robby Workman, Alan Hicks, Paul # Other contributors: Bob Lounsbury, Robby Workman, Alan Hicks, Paul
# Wisehart, slakmagik (thanks for your diff!), Eric Hameleers, # Wisehart, slakmagik, Eric Hameleers, Michiel van Wessem, hba, Erik
# Michiel van Wessem, hba, Erik Hanson, Antoine, ktabic, and Ken # Hanson, Antoine, ktabic, and Ken Roberts. This script would not be
# Roberts. This script would not be where it is without the help of # where it is without the help of these folks. Thank you!
# these folks. Thank you!
# Variables # Variables
SCRIPT=${0##*/} SCRIPT=${0##*/}
@ -212,6 +211,7 @@ PKGS=$(ls *SBo*)
if [ -e "$PKGS" ]; then if [ -e "$PKGS" ]; then
echo "No SlackBuilds.org packages detected." >> $UPDATELIST echo "No SlackBuilds.org packages detected." >> $UPDATELIST
else else
echo "Building list of potential updates..."
echo "Listing installed SlackBuilds.org packages and flagging \ echo "Listing installed SlackBuilds.org packages and flagging \
potential updates..." >> $UPDATELIST potential updates..." >> $UPDATELIST
echo >> $UPDATELIST echo >> $UPDATELIST
@ -244,8 +244,8 @@ potential updates..." >> $UPDATELIST
if [ $PRGNAM = "openarena" ]; then if [ $PRGNAM = "openarena" ]; then
VERSION=$(egrep -m1 "^FINAL_VERSION" $NEWSB | sed -e 's/[ #}\t].*$//;s/^.*-//;s/\"//g') VERSION=$(egrep -m1 "^FINAL_VERSION" $NEWSB | sed -e 's/[ #}\t].*$//;s/^.*-//;s/\"//g')
fi fi
# Ugly hack for ctorrent # Ugly hack for ctorrent, argtable, and libevent
if [ $PRGNAM = "ctorrent" ]; then if [[ "$PRGNAM" == "ctorrent" || "$PRGNAM" == "argtable" || "$PRGNAM" == "libevent" ]]; then
NEWSRCVER="" NEWSRCVER=""
fi fi
NEWBUILD=$(egrep -m1 "^BUILD" $NEWSB | sed -e 's/^.*[=-]//;s/\"//;s/[ #}\t].*$//g') NEWBUILD=$(egrep -m1 "^BUILD" $NEWSB | sed -e 's/^.*[=-]//;s/\"//;s/[ #}\t].*$//g')
@ -426,14 +426,16 @@ browse_items () {
# This function iterates through the list of software packages until # This function iterates through the list of software packages until
# one is chosen. # one is chosen.
get_category_items_list get_category_items_list
if [ -z "$T" ]; then T="aaa"; fi
while [ 0 ]; do while [ 0 ]; do
dialog --title "Browsing the $CATEGORY category" \ dialog --default-item "$T" --title "Browsing the $CATEGORY \
--menu "Please select a software package" 20 70 15 \ category" --menu "Please select a software package" 20 70 15 \
--file $TMP/sbopkg_category_items_list 2>$TMP/sbopkg_item_selection --file $TMP/sbopkg_category_items_list 2>$TMP/sbopkg_item_selection
if [ $? = 1 ]; then if [ $? = 1 ]; then
break break
fi fi
info_item info_item
T="$(cat $TMP/sbopkg_item_selection)"
done done
} }
@ -441,14 +443,16 @@ browse_categories () {
# This function iterates through the category list until one is # This function iterates through the category list until one is
# chosen. # chosen.
get_category_list get_category_list
if [ -z "$S" ]; then S="Academic"; fi
while [ 0 ]; do while [ 0 ]; do
dialog --title "Choose a category" --menu "Please select the \ dialog --default-item "$S" --title "Choose a category" \
category you wish to browse." 20 70 14 \ --menu "Please select the category you wish to browse." 20 70 14 \
--file $TMP/sbopkg_category_list 2>$TMP/sbopkg_category_selection --file $TMP/sbopkg_category_list 2>$TMP/sbopkg_category_selection
if [ $? = 1 ]; then if [ $? = 1 ]; then
break break
fi fi
browse_items browse_items
S="$(cat $TMP/sbopkg_category_selection)"
done done
} }
@ -752,8 +756,9 @@ cd $CWD
main_menu () { main_menu () {
# This is the main dialog menu. # This is the main dialog menu.
if [ -z "$R" ] ; then R="Rsync" ; fi # Where Am I?
while [ 0 ]; do while [ 0 ]; do
dialog --title "SlackBuilds.org Package Browser \ dialog --default-item "$R" --title "SlackBuilds.org Package Browser \
(sbopkg version $SBOVER)" --menu \ (sbopkg version $SBOVER)" --menu \
"\nChoose one of the following or press <Cancel> to exit\n" \ "\nChoose one of the following or press <Cancel> to exit\n" \
19 69 10 \ 19 69 10 \