Changeset 1096

Timestamp:

Sep 15, 2011, 9:08:08 PM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

packaging: CreateZIPs: Fixed cleanup.

File:

• packaging/CreateZIPs.sh (modified) (8 diffs)

packaging/CreateZIPs.sh

@@ -12 +12 @@
 #
 
-out_dir="."
+out_dir_base="."
 
 cp="cp -Rdp"
@@ -133 +133 @@
 }
 
-cmd_cleanup()
-{
-    parse_version
-    [ -z "$ver_full" ] && die "Version is not defined."
-
-    [ -d "$out_dir/$ver_full" ] && \
-        run rm -rf "$out_dir/$ver_full"
-}
-
 create_zips()
 {
@@ -169 +160 @@
 {
     local inst_base="$1"
-    local out_dir="$2"
-    local build_num="$3"
+    local build_num="$2"
 
     [ -d "$inst_base" ] || die "'$inst_base' is not a directory."
-    [ -d "$out_dir" ] || die "'$out_dir' is not a directory."
+    [ -d "$out_dir_base" ] || die "'$out_dir_base' is not a directory."
 
     parse_version
@@ -181 +171 @@
     echo "Full version: $ver_full"
 
-    out_dir="$out_dir/tmp-zip-qt4-$ver_full"
-
-    cmd_cleanup
+    local out_dir="$out_dir_base/tmp-zip-qt4-$ver_full"
+
+    run rm -rf "$out_dir"
 
     #--------------------------------------------------------------------------
@@ -303 +293 @@
     create_zips
 
-    cmd_cleanup
+    run rm -rf "$out_dir"
 
     echo "ALL DONE."
@@ -318 +308 @@
 start_dir=$(pwd)
 
-[ -z "$out_dir" ] && out_dir="."
-out_dir=$(readlink -m "$out_dir")
+[ -z "$out_dir_base" ] && out_dir_base="."
+out_dir_base=$(readlink -m "$out_dir_base")
 
 # Parse arguments
@@ -329 +319 @@
 Usage:
   $script_name all [options]    Create ZIPs.
-  $script_name cleanup          Remove what this script creates (except ZIPs).
 
 Options:
   <instdir>     (*) Qt installation tree location
-  <outdir>          Destination directory for ZIPs [$out_dir]
+  <outdir>          Destination directory for ZIPs [$out_dir_base]
   <bldnum>          Build number [none]
 "
@@ -339 +328 @@
 
 case "$1" in
-    cleanup) cmd_cleanup;;
     all)
         if [ -n "$2" ]; then
-            [ -n "$3" ] && out_dir=$(echo "$3" | tr '\\' '/')
-            cmd_create $(echo "$2" | tr '\\' '/') "$out_dir" "$4"
+            [ -n "$3" ] && out_dir_base=$(echo "$3" | tr '\\' '/')
+            cmd_create $(echo "$2" | tr '\\' '/') "$4"
         else
             cmd_help