Ticket #106: out1.diff

netlabs-rpmbuild-all.sh

@@ -52 +52 @@
 test -n "$spec" || { echo "ERROR: You must specify a .spec file."; exit 1; }
 
 spec_name="${spec##*/}"
+logDir='.'
 
 # Set up official netlabs.org rpmbuild environment
 . netlabs-rpmbuild-env.sh
 
+if test -d "$logDir" ; then
+# already around
+else
+  run mkdir -p "$logDir"
+fi
+
 # Override variables from the command line, if any
 shift
 while test "$1" != "" ; do
@@ -79 +86 @@
 
 # Generate RPMs
 for arch in $NETLABS_RPM_ARCH_LIST ; do
-  echo "Creating RPMs for '$arch' target (logging to $spec_name.$arch.log)..."
-  log_run "$spec_name.$arch.log" rpmbuild --target=$arch -bb "$spec"
+  echo "Creating RPMs for '$arch' target (logging to $logDir/$spec_name.$arch.log)..."
+  log_run "$logDir/$spec_name.$arch.log" rpmbuild --target=$arch -bb "$spec"
 done
 
 # Generate SRPM
-echo "Creating SRPM (logging to $spec_name.srpm.log)..."
-log_run "$spec_name.srpm.log" rpmbuild -bs "$spec"
+echo "Creating SRPM (logging to $logDir/$spec_name.srpm.log)..."
+log_run "$logDir/$spec_name.srpm.log" rpmbuild -bs "$spec"
 
 # Generate ZIP
-echo "Creating ZIP (logging to $spec_name.zip.log)..."
+echo "Creating ZIP (logging to $logDir/$spec_name.zip.log)..."
 create_zip()
 {(
-  zip=`grep "src.rpm" "$spec_name.srpm.log" | sed -e "s#^[a-zA-Z ]*: *##g" -e "s#.src.rpm##g" | tr . _`.zip
+  zip=`grep "src.rpm" "$logDir/$spec_name.srpm.log" | sed -e "s#^[a-zA-Z ]*: *##g" -e "s#.src.rpm##g" | tr . _`.zip
   zip_dir="${zip%/*}/../zip"
   zip="$zip_dir/${zip##*/}"
   echo "Will create '$zip'"
   run mkdir -p "$zip_dir"
   rm -r "@unixroot" 2> /dev/null
-  for rpm in `grep "$zip_arch.rpm\|noarch.rpm" "$spec_name.$zip_arch.log" | sed "s#^[a-zA-Z ]*: *##g"` ; do
+  for rpm in `grep "$zip_arch.rpm\|noarch.rpm" "$logDir/$spec_name.$zip_arch.log" | sed "s#^[a-zA-Z ]*: *##g"` ; do
     echo "Unpacking $rpm..."
     run rpm2cpio "$rpm" | cpio -idm
   done
   rm -f "$zip" 2> /dev/null
   run zip -mry9 "$zip" "@unixroot"
 )}
-log_run "$spec_name.zip.log" create_zip
+log_run "$logDir/$spec_name.zip.log" create_zip
 
 echo "All done."