doplneni uvozovek u promennych; pridano nastaveni verze balicku pomoci argumentu skriptu

packages/build-server.sh

@@ -6,13 +6,13 @@
 #
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 
-VERSION="2.1"
+VERSION="2.2"
 
 err()
 {
   echo "FAILED!"
-  cat $err
-  rm -rf $err $package $tar $sig
+  cat "$err"
+  rm -f "$err" "$package" "$tar" "$sig"
   echo
   echo "Build of $package package FAILED!!!"
   exit 1
@@ -23,11 +23,15 @@ err()
 #				MAIN
 #-------------------------------------------------------------------------------
 
-# edit when you build new package
-version="2.1"
+if [ -z "$1"]; then
+	echo "Usage: ${0##*/} <package_version_number>"
+	echo
+	echo "Example: ${0##*/} \"2.2\""
+	exit 1
+fi
 
 package_name="warden-server"
-package="${package_name}-${version}"
+package="${package_name}-$1"
 bin="${package}/${package_name}/bin"
 doc="${package}/${package_name}/doc"
 etc="${package}/${package_name}/etc"
@@ -41,51 +45,51 @@ echo "Building $package_name package version $version ..."
 echo
 
 echo -n "Building 'base' directory ... "
-mkdir -p $package 2> $err || err
-cp ../src/${package_name}/sh/install.sh $package 2> $err || err
-cp ../src/${package_name}/sh/update.sh $package 2> $err || err
-cp ../src/${package_name}/sh/uninstall.sh $package 2> $err || err
-cp ../src/${package_name}/doc/AUTHORS $package 2> $err || err
-cp ../src/${package_name}/doc/CHANGELOG $package 2> $err || err
-cp ../src/${package_name}/doc/INSTALL $package 2> $err || err
-cp ../src/${package_name}/doc/LICENSE $package 2> $err || err
-cp ../src/${package_name}/doc/README $package 2> $err || err
-cp ../src/${package_name}/doc/UNINSTALL $package 2> $err || err
-cp ../src/${package_name}/doc/UPDATE $package 2> $err || err
+mkdir -p "$package" 2> "$err" || err
+cp "../src/${package_name}/sh/install.sh" "$package" 2> "$err" || err
+cp "../src/${package_name}/sh/update.sh" "$package" 2> "$err" || err
+cp "../src/${package_name}/sh/uninstall.sh" "$package" 2> "$err" || err
+cp "../src/${package_name}/doc/AUTHORS" "$package" 2> "$err" || err
+cp "../src/${package_name}/doc/CHANGELOG" "$package" 2> "$err" || err
+cp "../src/${package_name}/doc/INSTALL" "$package" 2> "$err" || err
+cp "../src/${package_name}/doc/LICENSE" "$package" 2> "$err" || err
+cp "../src/${package_name}/doc/README" "$package" 2> "$err" || err
+cp "../src/${package_name}/doc/UNINSTALL" "$package" 2> "$err" || err
+cp "../src/${package_name}/doc/UPDATE" "$package" 2> "$err" || err
 
 echo "OK"
 
 echo -n "Building '${bin}' directory ... "
-mkdir -p $bin 2> $err || err
-cp -R ../src/${package_name}/bin/* $bin 2> $err || err
+mkdir -p "$bin" 2> "$err" || err
+cp -R "../src/${package_name}/bin/"* "$bin" 2> "$err" || err
 echo "OK"
 
 echo -n "Building '${doc}' directory ... "
-mkdir -p $doc 2> $err || err
-cp -R ../src/${package_name}/doc/* $doc 2> $err || err
+mkdir -p "$doc" 2> "$err" || err
+cp -R "../src/${package_name}/doc/"* "$doc" 2> "$err" || err
 echo "OK"
 
 echo -n "Building '${etc}' directory ... "
-mkdir -p $etc 2> $err || err
-cp ../src/${package_name}/etc/package_version $etc 2> $err || err
+mkdir -p "$etc" 2> "$err" || err
+cp "../src/${package_name}/etc/package_version" "$etc" 2> "$err" || err
 echo "OK"
 
 echo -n "Building '${lib}' directory ... "
-mkdir -p $lib 2> $err || err
-cp -R ../src/${package_name}/lib/* $lib 2> $err || err
-rm -rf ${lib}/*.t 2> $err || err
+mkdir -p "$lib" 2> "$err" || err
+cp -R "../src/${package_name}/lib/"* "$lib" 2> "$err" || err
+rm -f "${lib}/"*.t 2> "$err" || err
 echo "OK"
 
 
 # create tarball
 echo -n "Creating $tar tarball ... "
-tar czf $tar $package 2> $err || err
+tar czf "$tar" "$package" 2> "$err" || err
 echo "OK"
 
 
 #  create sign of tarball
 echo -n "Creating $sig file ... "
-sha1sum $tar > $sig 2> $err || err
+sha1sum "$tar" > "$sig" 2> "$err" || err
 echo "OK"
 
 
@@ -93,6 +97,6 @@ echo
 echo "Building of $package package was SUCCESSFULL"
 
 # cleanup section
-rm -rf $package $err
+rm -rf "$package" "$err"
 
 exit 0