Changeset 728

Timestamp:

Apr 1, 2016, 10:21:12 PM (9 years ago)

Author:

dmik

Message:

rpmbuild-bot: Fix bad variable name error and release version 1.0.1.

File:

• rpmbuild-bot/rpmbuild-bot.sh (modified) (7 diffs)

rpmbuild-bot/rpmbuild-bot.sh ¶

@@ -2 +2 @@
 
 #
-# rpmbuild-bot.sh: RPM Build Bot version 1.0.
+# rpmbuild-bot.sh: RPM Build Bot version 1.0.1.
 #
 # Author: Dmitriy Kuminov <coding@dmik.org>
@@ -9 +9 @@
 # WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 #
+# History
+# -------
+#
+# 1.0.1 [01.04.2016]
+#   - Fix bad variable name error.
+#   - Understand .CMD extension in REXX wrapper.
+# 1.0 [01.04.2016]
+#   - Initial version.
+#
 # Synopsis
 # --------
 #
-# This script performs a build of RPM pakcages from a given .spec file in
+# This script performs a build of RPM packages from a given .spec file in
 # controlled environment to guarantee consistent results when building RPMs
 # different machines. It uses a separate file rpmbuild-bot-env.sh located
@@ -30 +39 @@
 # with a path specification.
 #
-# The second argument defines the command to perfrm. The default command is
+# The second argument defines the command to perform. The default command is
 # "build". The following sections will describe each command.
 #
@@ -202 +211 @@
   for arch in $RPMBUILD_BOT_ARCH_LIST ; do
     echo "Creating RPMs for '$arch' target (logging to $log_base.$arch.log)..."
-    log_run "$log_base.$arch.log" rpmbuild.exe --target=$arch -bb "$spec_full"
+#    log_run "$log_base.$arch.log" rpmbuild.exe --target=$arch -bb "$spec_full"
   done
 
   # Generate SRPM.
   echo "Creating SRPM (logging to $log_base.srpm.log)..."
-  log_run "$log_base.srpm.log" rpmbuild -bs "$spec_full"
+#  log_run "$log_base.srpm.log" rpmbuild -bs "$spec_full"
 
   # Find SRPM file name in the log.
@@ -213 +222 @@
   [ -n "$src_rpm" ] || die "Cannot find .src.rpm file name in '$log_base.srpm.log'."
 
-  # Find pacakge version.
+  # Find package version.
   local ver_full="${src_rpm%.src.rpm}"
   local ver_full="${ver_full##*/${spec_name}-}"
   [ -n "$ver_full" ] || die "Cannot deduce package version from '$src_rpm'."
 
-  # Find all RPM packages for the base arch.
-  local rpms=`grep "^Wrote: \+.*\.\($base_arch\.rpm\|noarch\.rpm\)$" "$log_base.$base_arch.log" | sed -e "s#^Wrote: \+##g"`
+  # Find all RPM packages for the base arch (note the quotes around `` - it's to preserve multi-line result).
+  local rpms="`grep "^Wrote: \+.*\.\($base_arch\.rpm\|noarch\.rpm\)$" "$log_base.$base_arch.log" | sed -e "s#^Wrote: \+##g"`"
   [ -n "$rpms" ] || die "Cannot find .$base_arch.rpm/.noarch.rpm file names in '$log_base.base_arch.log'."
 
@@ -231 +240 @@
     run cd "$zip_dir"
     rm -r "@unixroot" 2> /dev/null
-    for f in "$rpms" ; do
+    # Note no quoters around $rpms - it's to split at EOL.
+    for f in $rpms ; do
       echo "Unpacking $f..."
       run rpm2cpio "$f" | cpio -idm
@@ -253 +263 @@
   # Save other arch RPMs.
   for arch in ${RPMBUILD_BOT_ARCH_LIST%${base_arch}} ; do
-    rpms=`grep "^Wrote: \+.*\.$arch\.rpm$" "$log_base.$arch.log" | sed -e "s#^Wrote: \+##g"`
+    rpms="`grep "^Wrote: \+.*\.$arch\.rpm$" "$log_base.$arch.log" | sed -e "s#^Wrote: \+##g"`"
     [ -n "$rpms" ] || die "Cannot find .$arch.rpm file names in '$log_base.arch.log'."
-    for f in "$rpms" ; do
+    for f in $rpms ; do
       echo "$f" >> "$ver_list"
     done