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

added check before pkg building to see if a local SlackBuild exists and if it does, offer the user a choice of which SlackBuild to use. This works in the dialog but not on the command line yet.

Browse Source
This commit is contained in:
chess.griffin 2008-03-29 04:25:46 +00:00
parent efda966a23
commit c2dd179e7a
1 changed files with 47 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
src/usr/bin/sbopkg
View File

@ -24,13 +24,14 @@
# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
# #
# 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 (thanks for your diff!), Eric Hameleers,
# Michiel van Wessem
# Variables # Variables
SCRIPT=${0##*/} SCRIPT=${0##*/}
DIAG="" DIAG=""
SBOPKG_CONF="${SBOPKG_CONF:-/etc/sbopkg/sbopkg.conf}" SBOPKG_CONF="${SBOPKG_CONF:-/etc/sbopkg/sbopkg.conf}"
CWD="$(pwd)" CWD="($pwd)"
VER=0.0.4 VER=0.0.4
sanity_checks () { sanity_checks () {
@ -129,8 +130,8 @@ dialog --title "$APP Information" --menu "Choose an item or press \
"Info" "View the .info file" \ "Info" "View the .info file" \
"Slack-desc" "View the slack-desc file" \ "Slack-desc" "View the slack-desc file" \
"SlackBuild" "View the SlackBuild file" \ "SlackBuild" "View the SlackBuild file" \
"Edit" "Create and edit a local copy of the SlackBuild file" \ "Edit" "Create and edit a local SlackBuild" \
"Delete" "Delete the local copy of the SlackBuild file" \ "Delete" "Delete the local SlackBuild" \
"Build" "Build a package for $APP" 2>$TMP/sbopkg_info_selection "Build" "Build a package for $APP" 2>$TMP/sbopkg_info_selection
if [ $? = 1 ]; then if [ $? = 1 ]; then
@ -169,7 +170,40 @@ as the root user in order to build packages." 0 0
continue continue
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
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
SLACKBUILD="original"
fi
fi
if [ $SLACKBUILD = "cancel" ]; then
continue
fi
rm -rf $TMP/sbopkg_build.lck rm -rf $TMP/sbopkg_build.lck
touch $TMP/sbopkg_build.lck touch $TMP/sbopkg_build.lck
( build_package $APP >> $OUTPUT & ) 2>>$OUTPUT ( build_package $APP >> $OUTPUT & ) 2>>$OUTPUT
@ -177,7 +211,7 @@ as the root user in order to build packages." 0 0
dialog --backtitle "Building the $APP package in the \ dialog --backtitle "Building the $APP package in the \
background." --tailbox $OUTPUT 20 70 background." --tailbox $OUTPUT 20 70
done done
if [ "$LOGS" = "YES" ]; then if [ "$KEEPLOG" = "YES" ]; then
cat $OUTPUT >> $TMP/sbopkg-build-log cat $OUTPUT >> $TMP/sbopkg-build-log
fi fi
rm -f $OUTPUT rm -f $OUTPUT
@ -328,7 +362,13 @@ else
continue continue
fi fi
echo "Building Slackware package for "$SRCNAME"..." echo "Building Slackware package for "$SRCNAME"..."
sh $PKG.SlackBuild if [ "$SLACKBUILD" = "original" ]; then
sh $PKG.SlackBuild
fi
if [ "$SLACKBUILD" = "local" ]; then
sh $PKG.SlackBuild.sbopkg
fi
#sh $PKG.SlackBuild
echo "Done building $PKG." echo "Done building $PKG."
rm -rf $TMP/sbopkg_build.lck rm -rf $TMP/sbopkg_build.lck
cd $LOCALREPO/$SLACKVER cd $LOCALREPO/$SLACKVER