X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=build%2Finstaller;h=39e62e61be2d068d632482b9fb765f8eccf2ced1;hb=df17c554147ac4d68ead793d60ca1f8208bd2e6f;hp=39154ee072dc8a047e1b310781c80a255317f55f;hpb=db0dbf48a55529c7a42ba741ef1bf9746a056d53;p=libucw.git

diff --git a/build/installer b/build/installer
index 39154ee0..39e62e61 100755
--- a/build/installer
+++ b/build/installer
@@ -8,25 +8,31 @@ 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 -o $a == url-equiv ] ; 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