'make tests' should not display error messages when the tmp dir is empty

[libucw.git] / build / installer

diff --git a/build/installer b/build/installer
index 164ae2fabcbacb7743a268ede2a3c81f6f92c4f6..b5bf16f20f9b699d18733b52193cbc4b7097e6a2 100755 (executable)
--- a/build/installer
+++ b/build/installer
@@ -8,25 +8,26 @@ for d in "" cf $SH_EXTRA_RUNDIRS ; do
                mkdir -p $DEST/$d
        fi
 done
-echo "Installing binaries..."
-rm -rf $DEST/{bin,lib}
-mkdir -p $DEST/{bin,lib}
-cp -aL run/bin/* $DEST/bin/
-cp -aL run/lib/* $DEST/lib/
+for d in $SH_INSTALL_RUNDIRS ; do
+       echo "Installing to $DEST/$d"
+       rm -rf $DEST/$d
+       mkdir -p $DEST/$d
+       cp -aL run/$d/* $DEST/$d/
+done
 echo "Installing config files..."
 for a in $SH_CONFIGS ; do
        if [ -f run/cf/$a ] ; then
                if [ ! -f $DEST/cf/$a ] ; then
                        echo "cf/$a: new, installed"
                        cp run/cf/$a $DEST/cf/$a
-               elif [ $a == catalog-rules ] ; then
+               elif [ $a = catalog-rules ] ; then
                        echo "cf/$a: will be regenerated automatically"
                elif diff -u $DEST/cf/$a run/cf/$a ; then
                        echo "cf/$a: no differences"
                else
                        echo -n "cf/$a differs, replace it [Yn]? "
                        read x
-                       if [ -z "$x" -o "$x" == "y" -o "$x" == "Y" ] ; then
+                       if [ -z "$x" -o "$x" = "y" -o "$x" = "Y" ] ; then
                                echo "cf/$a: replacing and keeping the old version as cf/$a.old"
                                mv $DEST/cf/$a $DEST/cf/$a.old
                                cp run/cf/$a $DEST/cf/$a