uprava buildovaciho skriptu pro sestaveni balicku klienta

packages/build-client.sh

@@ -2,20 +2,18 @@
 #
 # build-client.sh
 #
-# Copyright (C) 2011-2012 Cesnet z.s.p.o
+# Copyright (C) 2011-2015 Cesnet z.s.p.o
 #
 # Use of this source is governed by a BSD-style license, see LICENSE file.
 
-VERSION="1.2"
+VERSION="2.2"
 
-#-------------------------------------------------------------------------------
-#				FUNCTIONS
-#-------------------------------------------------------------------------------
 err()
 {
   echo "FAILED!"
-  cat $err
-  rm -rf $err $package $tar $sig
+  echo -n "Error: " && cat "$err"
+  rm -f "$err" "$tar" "$sig"
+  rm -rf "$package"
   echo
   echo "Build of $package package FAILED!!!"
   exit 1
@@ -26,73 +24,86 @@ err()
 #				MAIN
 #-------------------------------------------------------------------------------
 
-# edit when you build new package
-version="2.2-beta"
+if [ -z "$1" ]; then
+	echo "Usage: ${0##*/} <package_version_number>"
+	echo
+	echo "Example: ${0##*/} \"2.2\""
+	exit 1
+fi
 
 package_name="warden-client"
-package="${package_name}-${version}"
-doc="${package}/${package_name}/doc"
-etc="${package}/${package_name}/etc"
-lib="${package}/${package_name}/lib"
-var="${package}/${package_name}/var"
+package="${package_name}-$1"
+bin="${package}/bin"
+doc="${package}/doc"
+etc="${package}/etc"
+lib="${package}/lib"
+sh="${package}/sh"
 tar="${package}.tar.gz"
 sig="${tar}.sig"
 err="/tmp/${package}-err"
 
 # make directory structure
-echo "Building $package_name package version $version ..."
+echo "Building $package package..."
 echo
 
 echo -n "Building 'base' directory ... "
-mkdir -p $package 2> $err || err
-cp -R ../src/${package_name}/sh/* $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/README.cesnet $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/updateCommon.pm" "$package" 2> "$err" || err
+cp "../src/${package_name}/doc/INSTALL" "$package" 2> "$err" || err
+cp "../src/${package_name}/doc/README" "$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
+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/"* "$etc" 2> "$err" || err
+rm -f "${etc}/"*.conf 2> "$err" || err
 echo "OK"
 
-
 echo -n "Building '${lib}' directory ... "
-mkdir -p $lib 2> $err || err
-cp -R ../src/${package_name}/lib/*.pm $lib 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"
 
+echo -n "Building '${sh}' directory ... "
+mkdir -p "$sh" 2> "$err" || err
+cp "../src/${package_name}/sh/uninstall.sh" "$sh" 2> "$err" || err
+echo "OK"
 
-echo -n "Building '${var}' directory ... "
-mkdir -p $var 2> $err || err
+echo -n "Creating MANIFEST file ... "
+cd "$package" && find . -mindepth 2 -type f | grep -v tmpl | sed 's/.\///' | uniq > "doc/MANIFEST" && cd $OLDPWD || 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
+#  create sign of tarball
 echo -n "Creating $sig file ... "
-sha1sum $tar > $sig 2> $err || err
+sha1sum "$tar" > "$sig" 2> "$err" || err
 echo "OK"
 
 
 echo
-echo "Building of $package package was SUCCESSFULL"
+echo "Building of $package package was SUCCESSFULL!!!"
 
 # cleanup section
-rm -rf $package $err
+rm -rf "$package" "$err"
 
 exit 0