sbrun: get rid of chown warning, fix -i help.

3 files changed, 13 insertions, 5 deletions

diff --git a/mkslackinfo b/mkslackinfo
index 75e1f3f..85967a9 100755
--- a/mkslackinfo
+++ b/mkslackinfo
@@ -323,8 +323,8 @@ rm -rf $PRGNAM-$VERSION
 __EXTRACT__
 cd $PRGNAM-$VERSION
 chown -R root:root .
-find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
-        \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
+find -L .  -perm /111 -a \! -perm 755 -a -exec chmod -h 755 {} + -o \
+        \! -perm /111 -a \! -perm 644 -a -exec chmod -h 644 {} +
 
 __BUILD__
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
diff --git a/sbqrun b/sbqrun
index 1551a9c..92c08d8 100755
--- a/sbqrun
+++ b/sbqrun
@@ -6,13 +6,14 @@
 
 if [ "$1" = "" ] || [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
 	cat <<EOF
-Usage: $( basename $0 ) [-n] [-t] [-p] arg [arg ...]
+Usage: $( basename $0 ) [-n] [-t] [-p] [-d] arg [arg ...]
 
 Options:
   -t  Don't track filesystem writes (passed to sbrun).
   -n  Allow network access (passed to sbrun).
   -p  If a binary package already exists for a given build, install
       it instead of building a new one.
+  -d  Download sources only; do not build or install packages.
 
 Run this script from the top level of a SBo repo clone!
 
@@ -45,6 +46,8 @@ cdsb
 for arg; do
 	if [ "$arg" = "-p" ]; then
 		use_prebuilt=yes
+	elif [ "$arg" = "-d" ]; then
+		download_only=yes
 	elif [ "$arg" = "-t" -o "$arg" = "-n" ]; then
 		SBRUN_OPTS="$SBRUN_OPTS $arg"
 	elif [ "$arg" = "-" ]; then
@@ -95,6 +98,11 @@ for build in $BUILDS; do
 
 	sbodl || echo "==== sbqrun: WARN: download failed, trying build anyway"
 
+	if [ "$download_only" = "yes" ]; then
+		echo "==== sbqrun: downloaded source for $build"
+		continue
+	fi
+
 	if ! sbrun -c $SBRUN_OPTS; then
 		echo "==== sbqrun: BUILD FAILED: $build, see $(pwd)/build.log"
 		FAILED+="$build "
diff --git a/sbrun b/sbrun
index 08943bf..321575d 100755
--- a/sbrun
+++ b/sbrun
@@ -129,7 +129,7 @@ beginning with - must occur before [script] or [variable=value].
      CC and CXX, allows network access, and disables filesystem tracking.
 
 -i   Install the package after building it. This just runs "upkg" in the
-     SlackBuild directory, so "sbrun -u" is just a shortcut for typing
+     SlackBuild directory, so "sbrun -i" is just a shortcut for typing
      "sbrun && upkg". No package will be installed if the build script
      fails.
 
@@ -394,7 +394,7 @@ echo
 
 # set the build log's ownership to the calling user, or at least the
 # user that owns the current directory.
-chown "$( stat -c %U.%G . )" $BUILDLOG
+chown "$( stat -c %U:%G . )" $BUILDLOG
 
 # rest of arg parsing can use warn or die.
 if echo "$1" | grep -qv '='; then