diff --git a/commands/scripts/binpackage.sh b/commands/scripts/binpackage.sh index a32e30f95..4d7eeff0a 100644 --- a/commands/scripts/binpackage.sh +++ b/commands/scripts/binpackage.sh @@ -41,12 +41,16 @@ touch $packagestart sleep 1 cd $dir -if [ ! -f build ] -then echo "Error: No build script in $dir." +if [ ! -f build -a ! -f build.minix ] +then echo "Error: No build or build.minix script in $dir." exit 1 fi -sh -e build +if [ -f build.minix ] +then sh -e build.minix +else sh -e build +fi + echo " * Building package" ( if [ -f $PI ]; then echo $PI; fi; find / -cnewer $packagestart | egrep -v "^($srcdir|/(dev|tmp)|/usr/(tmp|log|adm|run|src)|/etc/utmp|/var/run)" ) | pax -w -d | bzip2 >$tarbz rm -f $packagestart $findlist $tarcmd diff --git a/commands/scripts/easypack.sh b/commands/scripts/easypack.sh index d3cd8ee01..fbe63a9cf 100644 --- a/commands/scripts/easypack.sh +++ b/commands/scripts/easypack.sh @@ -95,7 +95,13 @@ do # Check to see if it exists. Don't overwrite unless -o given # It is now unpacked. Build it cd $i binsizes big - if sh build >>$ORIG_DIR/Log 2>&1 + if [ -f build.minix ] + then sh build.minix >>$ORIG_DIR/Log 2>&1 + r=$? + else sh build >>$ORIG_DIR/Log 2>&1 + r=$? + fi + if [ $r -eq 0 ] then echo Package $i installed else echo Package $i failed to install, see Log fi