Miroirs/sbopkg
1
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2025-01-13 20:01:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

add patch from hba to check for all variable in the config file; cleaned up old commented out code

Browse source
This commit is contained in:
chess.griffin 2008-03-29 21:59:05 +00:00
parent 37eed9bf13
commit 96e4fbd924
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/usr/bin/sbopkg
View file

@ -25,7 +25,7 @@
# #
# 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 # Michiel van Wessem, hba
# Variables # Variables
SCRIPT=${0##*/} SCRIPT=${0##*/}
@ -35,13 +35,25 @@ CWD="$(pwd)"
VER=0.0.4 VER=0.0.4
sanity_checks () { sanity_checks () {
# Check if config file is there and if yes, set some variables # Check if config file is there and if so check that it has all
# needed variables with any value, and set them; also create
# $SRCDIR if it's not there..
if [ ! -e $SBOPKG_CONF ]; then if [ ! -e $SBOPKG_CONF ]; then
echo "$SCRIPT: No $SBOPKG_CONF file was found." echo "$SCRIPT: No $SBOPKG_CONF file was found."
echo "Please create it and run $SCRIPT again." 1>&2 echo "Please create it and run $SCRIPT again." 1>&2
exit 1 exit 1
else else
for i in RSYNCMIRROR SLACKVER LOCALREPO SRCDIR TMP KEEPLOG
do
grep "^$i=.\{1,\}" "$SBOPKG_CONF" > /dev/null
if [ "$?" != 0 ]; then
echo "$SCRIPT: Can't find variable $i declared in"
echo "$SCRIPT: $SBOPKG_CONF."
echo "Please declare it and run $SCRIPT again."
exit 1
fi
. $SBOPKG_CONF . $SBOPKG_CONF
done
fi fi
if [ ! -d "$SRCDIR" ]; then if [ ! -d "$SRCDIR" ]; then
echo "Creating local cache directory $SRCDIR to keep \ echo "Creating local cache directory $SRCDIR to keep \
@ -280,7 +292,6 @@ else
dialog --title "Keep Log?" --yesno "Would you like to keep the \ dialog --title "Keep Log?" --yesno "Would you like to keep the \
permanent build log $TMP/sbopkg-build-log? Select YES to keep or NO \ permanent build log $TMP/sbopkg-build-log? Select YES to keep or NO \
to delete." 10 30 to delete." 10 30
#2>$TMP/sbopkg_keep_log
if [ $? = 1 ]; then if [ $? = 1 ]; then
check_root check_root
if [ $ROOT = "false" ]; then if [ $ROOT = "false" ]; then
@ -323,7 +334,6 @@ if [ "$DIAG" = 1 ]; then
rm -rf $TMP/sbopkg_rsync.lck rm -rf $TMP/sbopkg_rsync.lck
touch $TMP/sbopkg_rsync.lck touch $TMP/sbopkg_rsync.lck
OUTPUT=$TMP/sbopkg_output OUTPUT=$TMP/sbopkg_output
#( /usr/bin/rsync -avz --delete --dry-run --timeout=5 --contimeout=5 $RSYNCMIRROR/$SLACKVER/ \
( rsync_command >> $OUTPUT & ) 2>>$OUTPUT ( rsync_command >> $OUTPUT & ) 2>>$OUTPUT
while [ -f $TMP/sbopkg_rsync.lck ]; do while [ -f $TMP/sbopkg_rsync.lck ]; do
dialog --backtitle "Rsyncing with SlackBuilds.org" \ dialog --backtitle "Rsyncing with SlackBuilds.org" \
@ -331,8 +341,6 @@ if [ "$DIAG" = 1 ]; then
done done
rm -f $OUTPUT rm -f $OUTPUT
else else
# /usr/bin/rsync -avz --delete \
#$RSYNCMIRROR/$SLACKVER/ $LOCALREPO/$SLACKVER/
rsync_command rsync_command
fi fi
} }
@ -411,7 +419,6 @@ fi
if [ "$SLACKBUILD" = "local" ]; then if [ "$SLACKBUILD" = "local" ]; then
sh $PKG.SlackBuild.sbopkg sh $PKG.SlackBuild.sbopkg
fi 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
@ -513,7 +520,7 @@ done
# If there are no command line options then we will use the dialog # If there are no command line options then we will use the dialog
# version of sbopkg # version of sbopkg
cleanup cleanup # Do this first just in case there is cruft left over
if [ $# -eq 0 ]; then if [ $# -eq 0 ]; then
DIAG=1 DIAG=1