Added the local copy of the regex library back.

[libucw.git] / build / installer

diff --git a/build/installer b/build/installer
index 99de43f0582d0f4003cf0356dff45fac7352ab4b..39e62e61be2d068d632482b9fb765f8eccf2ced1 100755 (executable)
--- a/build/installer
+++ b/build/installer
@@ -11,7 +11,8 @@ done
 for d in $SH_INSTALL_RUNDIRS ; do
        echo "Installing to $DEST/$d"
        rm -rf $DEST/$d
-       cp -aL run/$d $DEST/$d
+       mkdir -p $DEST/$d
+       cp -aL run/$d/* $DEST/$d/
 done
 echo "Installing config files..."
 for a in $SH_CONFIGS ; do
@@ -19,14 +20,19 @@ for a in $SH_CONFIGS ; do
                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 "$SH_AUTO_CONFIRM" ] ; then
+                               read x
+                       else
+                               x="$SH_AUTO_CONFIRM"
+                               echo "$x"
+                       fi
+                       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