Miroirs/sbopkg
1
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-12-27 09:58:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add back in slakmagiks code to show_readme, which I accidentally reverted

Browse source
This commit is contained in:
chess.griffin 2008-04-01 20:19:33 +00:00
parent a1e6cdde94
commit 2965d56099
1 changed files with 6 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
src/usr/bin/sbopkg
View file

@ -187,41 +187,6 @@ as the root user in order to build packages." 8 30
fi fi
OUTPUT=$TMP/sbopkg_output OUTPUT=$TMP/sbopkg_output
search_package $APP search_package $APP
# SLACKBUILD=""
# if [ ! -e $PKGPATH/$APP.SlackBuild.sbopkg ]; then
# SLACKBUILD="original"
# else
# if [ "$DIAG" = 1 ]; then
# while [ 0 ]; do
# dialog --title "Choose SlackBuild" --menu "A local \
#SlackBuild was found in addition to the original SlackBuild. \
#Which one would you like to use?" 10 60 2 \
#"Original" "Use the original SlackBuild" \
#"Local" "Use the local SlackBuild" 2>$TMP/sbopkg_bld_selection
#
# if [ $? = 1 ]; then
# # Need this to get back to $APP info menu
# SLACKBUILD="cancel"
# break
# fi
# B="$(cat $TMP/sbopkg_bld_selection)"
# if [ "$B" = "Original" ]; then
# SLACKBUILD="original"
# break
# fi
# if [ "$B" = "Local" ]; then
# SLACKBUILD="local"
# break
# fi
# done
# else
# echo "A local SlackBuild was found in addition to the \
#original SlackBuild. Which one would you like to use? Please enter
#'O' for original, 'L' for local, or 'X' to exit."
# read ANS
# SLACKBUILD="original"
# fi
# fi
pick_slackbuild pick_slackbuild
if [ $SLACKBUILD = "cancel" ]; then if [ $SLACKBUILD = "cancel" ]; then
continue continue
@ -367,19 +332,12 @@ SRCNAME=${DOWNLOAD##*/}
show_readme () { show_readme () {
# Show the package's text files. # Show the package's text files.
# I am still not happy with how this works and am trying to think # Thanks to slakmagik, this works much better. I may still look at
# of a better way to have these 4 docs available for viewing from the # other ways to do this. Perhaps have a way for the user to choose
# cli. Maybe have -s just return the readme, as the result of a # which of the 4 docs he wants to view? Or have a menu listing the 4
# search, and maybe have another option like -v to view all 4 docs? # docs? Undecided.
# Also, maybe have a way for the user to choose which of the 4 docs he ${PAGER:-more} $PKGPATH/{README,$PKGNAME.SlackBuild,$PKGNAME.info,\
# wants to view? Or have a menu listing the 4 docs? Undecided. slack-desc}
SBODOCS="README $PKGNAME.SlackBuild $PKGNAME.info slack-desc"
for i in $SBODOCS; do
echo
echo "Viewing "$i":"
${PAGER:-more} $PKGPATH/$i
read # This was added because README was scrolling past too quickly
done
return 0 return 0
} }