Skip to content
Snippets Groups Projects
Commit 3691bca3 authored by Tomáš Plesník's avatar Tomáš Plesník
Browse files

odstraneni nadbytecnych promennych ret_val; revize kodu

parent 9e1475df
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
packages/build-client.sh
+ 16
− 65
View file @ 3691bca3
......@@ -66,97 +66,48 @@ echo "Building $package_name package version $version ..."
echo
echo -n "Building 'base' directory ... "
mkdir -p $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp -R ../src/$package_name/sh/* $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/doc/CHANGELOG $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/doc/INSTALL $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/doc/LICENSE $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/doc/README $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/doc/README.cesnet $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
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
echo "OK"
echo -n "Building '$doc' directory ... "
mkdir -p $doc 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp -R ../src/$package_name/doc/* $doc 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
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; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/etc/package_version $etc 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
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; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp -R ../src/$package_name/lib/* $lib 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
mkdir -p $lib 2> $err || err
cp -R ../src/$package_name/lib/* $lib 2> $err || err
echo "OK"
echo -n "Building '$var' directory ... "
mkdir -p $var 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
mkdir -p $var 2> $err || err
echo "OK"
# create tarball
echo -n "Creating $tar tarball ... "
tar czf $tar $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
tar czf $tar $package 2> $err || err
echo "OK"
# create sign of tarball
echo -n "Creating $sig file ... "
sha1sum $tar > $sig 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
sha1sum $tar > $sig 2> $err || err
echo "OK"
......
packages/build-server.sh
+ 19
− 78
View file @ 3691bca3
......@@ -67,109 +67,50 @@ echo "Building $package_name package version $version ..."
echo
echo -n "Building 'base' directory ... "
mkdir -p $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/sh/install.sh $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/sh/uninstall.sh $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/doc/CHANGELOG $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/doc/INSTALL $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/doc/LICENSE $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/doc/README $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
mkdir -p $package 2> $err || err
cp ../src/$package_name/sh/install.sh $package 2> $err || err
cp ../src/$package_name/sh/uninstall.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
echo "OK"
echo -n "Building '$bin' directory ... "
mkdir -p $bin 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp -R ../src/$package_name/bin/* $bin 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp -R ../src/$package_name/sh/create_tables.sh $bin 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
mkdir -p $bin 2> $err || err
cp -R ../src/$package_name/bin/* $bin 2> $err || err
cp -R ../src/$package_name/sh/create_tables.sh $bin 2> $err || err
echo "OK"
echo -n "Building '$doc' directory ... "
mkdir -p $doc 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp -R ../src/$package_name/doc/* $doc 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
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; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp ../src/$package_name/etc/package_version $etc 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
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; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
cp -R ../src/$package_name/lib/* $lib 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
mkdir -p $lib 2> $err || err
cp -R ../src/$package_name/lib/* $lib 2> $err || err
echo "OK"
echo -n "Building '$var' directory ... "
mkdir -p $var 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
mkdir -p $var 2> $err || err
echo "OK"
# create tarball
echo -n "Creating $tar tarball ... "
tar czf $tar $package 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
tar czf $tar $package 2> $err || err
echo "OK"
# create sign of tarball
echo -n "Creating $sig file ... "
sha1sum $tar > $sig 2> $err; ret_val=`echo $?`
if [ $ret_val -ne 0 ]; then
err
fi
sha1sum $tar > $sig 2> $err || err
echo "OK"
......
src/warden-client/sh/install.sh
+ 6
− 12
View file @ 3691bca3
......@@ -156,8 +156,7 @@ old_client_chck()
perl_chck()
{
echo -n "Checking Perl interpreter ... "
which perl 1>/dev/null; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if which perl 1> /dev/null; then
echo "OK"
else
echo "FAILED!"
......@@ -172,8 +171,7 @@ modules_chck()
for module in ${modules[@]};
do
echo -n "Checking $module module ... "
perl -e "use $module" 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if perl -e "use $module" 2> $err; then
echo "OK"
else
err
......@@ -185,8 +183,7 @@ modules_chck()
make_warden_dir()
{
echo -n "Creating warden client directory ... "
cp -R $dirname/warden-client $prefix 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if cp -R $dirname/warden-client $prefix 2> $err; then
echo "OK"
else
err_clean
......@@ -204,8 +201,7 @@ make_warden_dir()
copy_key()
{
echo -n "Copying certificate key file ... "
cp $key $etc 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if cp $key $etc 2> $err; then
echo "OK"
else
err_clean
......@@ -216,8 +212,7 @@ copy_key()
copy_cert()
{
echo -n "Copying certificate file ... "
cp $cert $etc 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if cp $cert $etc 2> $err; then
echo "OK"
else
err_clean
......@@ -264,8 +259,7 @@ make_conf_file()
change_permissions()
{
echo -n "Changing permissions to installed package ... "
chown -R $user: $client_path 2>$err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if chown -R $user: $client_path 2>$err; then
echo "OK"
else
err_clean
......
src/warden-client/sh/uninstall.sh
+ 2
− 4
View file @ 3691bca3
......@@ -149,8 +149,7 @@ backup()
{
echo -n "Backing-up warden client directory ... "
mkdir $backup_dir
cp -R $client_path $backup_dir 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if cp -R $client_path $backup_dir 2> $err; then
echo "OK"
else
err
......@@ -161,8 +160,7 @@ backup()
uninstall_warden_client()
{
echo -n "Uninstalling $package_version package ... "
rm -rf $client_path 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if rm -rf $client_path 2> $err; then
echo "OK"
else
err_clean
......
src/warden-client/sh/update.sh
+ 6
− 12
View file @ 3691bca3
......@@ -143,8 +143,7 @@ obtain_package_version()
perl_chck()
{
echo -n "Checking Perl interpreter ... "
which perl 1>/dev/null; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if which perl 1> /dev/null; then
echo "OK"
else
echo "FAILED!"
......@@ -159,8 +158,7 @@ modules_chck()
for module in ${modules[@]};
do
echo -n "Checking $module module ... "
perl -e "use $module" 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if perl -e "use $module" 2> $err; then
echo "OK"
else
err
......@@ -186,8 +184,7 @@ backup()
{
echo -n "Backing-up warden client directory ... "
mkdir $backup_dir
cp -R $client_path $backup_dir 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if cp -R $client_path $backup_dir 2> $err; then
echo "OK"
else
err
......@@ -198,8 +195,7 @@ backup()
obtain_warden_user()
{
echo -n "Obtaining warden client directory owner ... "
user=`stat -c %U $conf_file` 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if user=`stat -c %U $conf_file` 2> $err; then
echo "OK"
else
err
......@@ -210,8 +206,7 @@ obtain_warden_user()
update_warden_dir()
{
echo -n "Updating warden client directory ... "
rsync -q --recursive --archive --delete --exclude='etc' --exclude='var' "$dirname/warden-client" $prefix 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if rsync -q --recursive --archive --delete --exclude='etc' --exclude='var' "$dirname/warden-client" $prefix 2> $err; then
echo "OK"
else
err_clean
......@@ -270,8 +265,7 @@ $ssl_ca_file
change_permissions()
{
echo -n "Changing permissions to updated package ... "
chown -R $user: $client_path 2>$err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if chown -R $user: $client_path 2>$err; then
echo "OK"
else
err_clean
......
src/warden-server/sh/uninstall.sh
+ 4
− 9
View file @ 3691bca3
......@@ -148,11 +148,8 @@ warden_dir_chck()
stop_warden_server()
{
$init stop
ret_val=`$init status | grep NOT; echo $?`
if [$ret_val -ne 0]; then
$init force-stop
fi
echo "Stopping warden server ... "
$init stop || $init force-stop
}
......@@ -160,8 +157,7 @@ backup()
{
echo -n "Backing-up warden server directory ... "
mkdir $backup_dir
cp -R $server_path $backup_dir 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if cp -R $server_path $backup_dir 2> $err; then
echo "OK"
else
err
......@@ -172,8 +168,7 @@ backup()
uninstall_warden_server()
{
echo -n "Uninstalling $package_version package ... "
rm -rf $server_path 2> $err; ret_val=`echo $?`
if [ $ret_val -eq 0 ]; then
if rm -rf $server_path 2> $err; then
echo "OK"
else
err_clean
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment