Miroirs/sbopkg
1
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-12-29 10:24:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add ARCH information to dialog backtitles; update ChangeLog-current

Browse source
This commit is contained in:
chess.griffin 2009-09-06 04:11:27 +00:00
parent e85ef69e1b
commit 61630757af
2 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog-current.txt
View file

@ -1,6 +1,7 @@
Fri Aug 28 17:46:26 UTC 2009 Sun Sep 6 04:10:58 UTC 2009
Sbopkg 0.XX.X released. This version contains the following fixes and Sbopkg 0.XX.X released. This version contains the following fixes and
enhancements: enhancements:
* * Fix typo in 50-default renames file.
* Add $ARCH information in dialog backtitles.
+--------------------------+ +--------------------------+

20
src/usr/sbin/sbopkg
View file

@ -1332,7 +1332,7 @@ browse_categories() {
while :; do while :; do
dialog --default-item "$DEFAULTITEM" --cancel-label "Back" \ dialog --default-item "$DEFAULTITEM" --cancel-label "Back" \
--title "Choose a category" --backtitle \ --title "Choose a category" --backtitle \
"Currently using the $REPO_DESC." \ "$(eval echo $BACKTITLE)" \
--menu "Please select a category or press <Back> to go back." \ --menu "Please select a category or press <Back> to go back." \
23 70 15 --file $SBOPKGTMP/sbopkg_category_list \ 23 70 15 --file $SBOPKGTMP/sbopkg_category_list \
2> $SBOPKGTMP/sbopkg_category_manual_selection 2> $SBOPKGTMP/sbopkg_category_manual_selection
@ -2273,8 +2273,7 @@ gen_search_package() {
# The default item can be "". In that case, dialog defaults to # The default item can be "". In that case, dialog defaults to
# the first item. # the first item.
dialog --title "Matches for $PKG in $CATEGORY" \ dialog --title "Matches for $PKG in $CATEGORY" \
--backtitle "$(crunch "Currently using the \ --backtitle "$(eval echo $BACKTITLE)" \
$REPO_DESC.")" \
--default-item "$SRCHPICK" --extra-button \ --default-item "$SRCHPICK" --extra-button \
--cancel-label "Back" \ --cancel-label "Back" \
--help-button --help-label "Main Menu" \ --help-button --help-label "Main Menu" \
@ -3778,7 +3777,7 @@ queue_menu() {
while :; do while :; do
dialog --title "Build Queue Menu" --backtitle \ dialog --title "Build Queue Menu" --backtitle \
"Currently using the $REPO_DESC." \ "$(eval echo $BACKTITLE)" \
--cancel-label "Back" --default-item "$DEFAULTITEM" --menu \ --cancel-label "Back" --default-item "$DEFAULTITEM" --menu \
"Choose one of the following or press <Back> to go back.\n" \ "Choose one of the following or press <Back> to go back.\n" \
16 60 9 \ 16 60 9 \
@ -3821,7 +3820,7 @@ utilities_menu() {
while :; do while :; do
dialog --title "Utilities Menu" --backtitle \ dialog --title "Utilities Menu" --backtitle \
"Currently using the $REPO_DESC." \ "$(eval echo $BACKTITLE)" \
--cancel-label "Back" --default-item "$DEFAULTITEM" --menu \ --cancel-label "Back" --default-item "$DEFAULTITEM" --menu \
"\nChoose one of the following or press <Back> to go back.\n" \ "\nChoose one of the following or press <Back> to go back.\n" \
14 69 6 \ 14 69 6 \
@ -3994,8 +3993,7 @@ main_menu() {
while :; do while :; do
dialog --cancel-label "Exit" --default-item "$DEFAULTITEM" --title \ dialog --cancel-label "Exit" --default-item "$DEFAULTITEM" --title \
"SlackBuilds.org Package Browser (sbopkg version $SBOVER)" \ "SlackBuilds.org Package Browser (sbopkg version $SBOVER)" \
--backtitle \ --backtitle "$(eval echo $BACKTITLE)" \
"Currently using the $REPO_DESC." \
--menu \ --menu \
"\nChoose one of the following or press <Exit> to exit.\n" \ "\nChoose one of the following or press <Exit> to exit.\n" \
17 69 8 \ 17 69 8 \
@ -4099,6 +4097,14 @@ if [[ ! $(uname -m) =~ 'i.86' ]]; then
export ARCH=${ARCH:-$(uname -m)} export ARCH=${ARCH:-$(uname -m)}
fi fi
# Set up BACKTITLE
if [[ -n $ARCH ]]; then
BACKTITLE='Browsing the $REPO_DESC. \$ARCH is set to $ARCH.'
else
BACKTITLE="$(crunch "Browsing the $REPO_DEC. Using default \$ARCH \
in SlackBuild scripts.")"
fi
# This is the command line options and help. # This is the command line options and help.
while getopts ":b:cd:e:f:g:hi:klopqrs:uv:" OPT; do while getopts ":b:cd:e:f:g:hi:klopqrs:uv:" OPT; do
case $OPT in case $OPT in