add some errors checks when building or installing from cli

This commit is contained in:
chess.griffin 2008-12-15 14:36:50 +00:00
parent a6e7a5d367
commit f0284c824a

View file

@ -852,23 +852,44 @@ if [ ! $(find -mindepth 2 -name "$PKG") ]; then
dialog --title "ERROR" --msgbox "Package $PKG not found" 0 0 dialog --title "ERROR" --msgbox "Package $PKG not found" 0 0
continue continue
else else
echo "$SCRIPT: Package $PKG not found." 1>&2 echo "ERROR: Package \"$PKG\" not found." 1>&2
continue continue
fi fi
else
pick_info
if [ "$DOTINFO" = "original" ]; then
. $PKGPATH/$PKG.info
fi
if [ "$DOTINFO" = "local" ]; then
. $PKGPATH/$PKG.info.sbopkg
fi
PKGNAME=${PKG##*/}
SRCNAME=${DOWNLOAD##*/}
SRCNAME=$(echo $SRCNAME | sed -e 's/\%2B/\+/g') # TiMidity fix for '+'
if [ "$PKG" = "django" ]; then
SRCNAME="Django-$RVERSION.tar.gz"
fi
if [ ! "$DIAG" = 1 ]; then
echo "Found"
echo "Name: $PKGNAME"
echo "Version: $VERSION"
echo
fi
fi fi
pick_info #echo
if [ "$DOTINFO" = "original" ]; then #pick_info
. $PKGPATH/$PKG.info #if [ "$DOTINFO" = "original" ]; then
fi # . $PKGPATH/$PKG.info
if [ "$DOTINFO" = "local" ]; then #fi
. $PKGPATH/$PKG.info.sbopkg #if [ "$DOTINFO" = "local" ]; then
fi # . $PKGPATH/$PKG.info.sbopkg
PKGNAME=${PKG##*/} #fi
SRCNAME=${DOWNLOAD##*/} #PKGNAME=${PKG##*/}
SRCNAME=$(echo $SRCNAME | sed -e 's/\%2B/\+/g') # TiMidity fix for '+' #SRCNAME=${DOWNLOAD##*/}
if [ "$PKG" = "django" ]; then #SRCNAME=$(echo $SRCNAME | sed -e 's/\%2B/\+/g') # TiMidity fix for '+'
SRCNAME="Django-$RVERSION.tar.gz" #if [ "$PKG" = "django" ]; then
fi # SRCNAME="Django-$RVERSION.tar.gz"
#fi
} }
gen_search_package () { gen_search_package () {
@ -1504,6 +1525,31 @@ to build packages."
fi fi
SBOPKGOUTPUT=$TMP/sbopkg_output SBOPKGOUTPUT=$TMP/sbopkg_output
rm -rf $TMP/sbopkg_summary rm -rf $TMP/sbopkg_summary
echo "Checking for valid package names..."
echo
for PKGBUILD in $BUILD; do
echo "Checking for \"$PKGBUILD\""
search_package $PKGBUILD
done
while true; do
echo
echo "Check complete."
echo
echo "Do you wish to proceed based on the search results above?"
echo "Packages not found will be skipped during the process."
echo
echo "Press (Y)es to proceed or (N)o to quit."
read ANS
case $ANS in
y* | Y* ) break
;;
n* | N* ) cleanup; exit 0
;;
* ) echo "Unknown response."
;;
esac
done
echo
for PKGBUILD in $BUILD; do for PKGBUILD in $BUILD; do
echo "Building $PKGBUILD" echo "Building $PKGBUILD"
search_package $PKGBUILD search_package $PKGBUILD