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

back out double info_item menu; hide 'permission denied' message when testing via touch whether a sbopkg dir is writable, since we tell the user that anyway; minor message tweaks.

Browse Source
This commit is contained in:
chess.griffin 2009-01-23 21:20:57 +00:00
parent d911a10706
commit 14cc6fe331
2 changed files with 25 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog-current.txt
View File

@ -31,10 +31,13 @@ enhancements:
where the user can decide the name and location of the permanent build
log, if used; thanks to slakmagik for the patch.
* Fix issue where downloaded sources with spaces in their file names would
cause an MD5SUM failure; thanks to alkos333 for the bug report.
cause an MD5SUM failure; thanks to alkos333 for the bug report, and thanks
to Mauro Giachero for improving my initial bug fix implementation.
* Commit several other patches from slakmagik that improve the handling of
the search box upon search failures; tweak the precheck log a bit; improve
the checking of root privilegs, and improve the handling of the
directory-creation checks; thanks to slakmagik for these patches.
* Lots of other internal 'under the hood' improvements to the repository
browsing, directory check functionality, and build queue.
+--------------------------+

60
src/usr/bin/sbopkg
View File

@ -115,7 +115,8 @@ ck_dir() {
# Try to create a file in the specified folder
if [[ $ERROR -eq 0 ]]; then
(touch $1/sbopkg-testfile && rm -f $1/sbopkg-testfile) || ERROR=2
(touch $1/sbopkg-testfile 2>/dev/null && rm -f $1/sbopkg-testfile \
2>/dev/null) || ERROR=2
fi
case $ERROR in
@ -305,8 +306,8 @@ check_for_updates () {
echo "No SlackBuilds.org packages detected." >> $UPDATELIST
else
crunch_fmt "Building list of potential updates. This may take a \
few moments depending on how many SlackBuilds.org packages you \
have installed..."
few moments depending on how many SlackBuilds.org packages are \
installed..."
crunch_fmt "Listing installed SlackBuilds.org packages and flagging \
potential updates..." >> $UPDATELIST
echo >> $UPDATELIST
@ -830,42 +831,23 @@ info_item () {
else
LPACKAGE="$APP (Installed: $KPACKAGE)"
fi
# Am considering reverting this double menu code back to original
# prior to r353.
if has_root; then
dialog --default-item "$U" \
--title "$APP ($RVERSION-$RARCH-$RBUILD)" \
--backtitle "$LPACKAGE" --extra-button --extra-label "Back" \
--cancel-label "Main Menu" --menu \
"$(crunch "Please choose an item or press <Back> to go back \
or press <Main Menu> to return to the main menu.\n")" \
18 60 10 \
"README" "View the README file" \
"Info" "View the .info file" \
"Slack-desc" "View the slack-desc file" \
"SlackBuild" "View the SlackBuild file" \
"Custom" "Customize the .info or SlackBuild" \
"Remove" "Remove $APP sources in cache" \
"Options" "Edit Build Options/Flavors" \
"Queue" "Add $APP to build queue" \
"Build" "Build a package for $APP" \
$JPACKAGE 2>$TMP/sbopkg_info_selection
else
dialog --default-item "$U" \
--title "$APP ($RVERSION-$RARCH-$RBUILD)" \
--backtitle "$LPACKAGE" --extra-button --extra-label "Back" \
--cancel-label "Main Menu" --menu \
"$(crunch "Please choose an item or press <Back> to go back \
or press <Main Menu> to return to the main menu.\n")" \
18 60 6 \
"README" "View the README file" \
"Info" "View the .info file" \
"Slack-desc" "View the slack-desc file" \
"SlackBuild" "View the SlackBuild file" \
"Custom" "Customize the .info or SlackBuild" \
"Options" "Edit Build Options/Flavors" \
2>$TMP/sbopkg_info_selection
fi
dialog --default-item "$U" \
--title "$APP ($RVERSION-$RARCH-$RBUILD)" \
--backtitle "$LPACKAGE" --extra-button --extra-label "Back" \
--cancel-label "Main Menu" --menu \
"$(crunch "Please choose an item or press <Back> to go back \
or press <Main Menu> to return to the main menu.\n")" \
18 60 10 \
"README" "View the README file" \
"Info" "View the .info file" \
"Slack-desc" "View the slack-desc file" \
"SlackBuild" "View the SlackBuild file" \
"Custom" "Customize the .info or SlackBuild" \
"Remove" "Remove $APP sources in cache" \
"Options" "Edit Build Options/Flavors" \
"Queue" "Add $APP to build queue" \
"Build" "Build a package for $APP" \
$JPACKAGE 2>$TMP/sbopkg_info_selection
CHOICE=$?
if [ $CHOICE = 1 ]; then
rm -f $TMP/sbopkg_*