X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build%2Finstaller;h=164ae2fabcbacb7743a268ede2a3c81f6f92c4f6;hb=9921b31fc64b555cb5b2301f55ed36d2c9cab572;hp=12e54772a233e7c5e93b2d54df164a5d9f7256ce;hpb=6e66ef30e1eee9391c0e44e3c08f5e160dfbbad2;p=libucw.git

diff --git a/build/installer b/build/installer
index 12e54772..164ae2fa 100755
--- a/build/installer
+++ b/build/installer
@@ -2,33 +2,37 @@
 set -e
 DEST=`eval echo $1`
 echo "Installing to $DEST"
-if [ ! -d $DEST/cf ] ; then
-	echo "Creating $DEST and the whole directory hierarchy under it."
-	mkdir -p $DEST/{cf,db,index,log,tmp}
-fi
+for d in "" cf $SH_EXTRA_RUNDIRS ; do
+	if [ ! -d $DEST/$d ] ; then
+		echo "Creating $DEST/$d"
+		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/
 echo "Installing config files..."
-for a in cf/* ; do
-	if [ -f $a ] ; then
-		if [ ! -f $DEST/$a ] ; then
-			echo "$a: new, installed"
-			cp $a $DEST/$a
-		elif diff -u $DEST/$a $a ; then
-			echo "$a: no differences"
+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
+			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 "$a differs, replace it [Yn]? "
+			echo -n "cf/$a differs, replace it [Yn]? "
 			read x
 			if [ -z "$x" -o "$x" == "y" -o "$x" == "Y" ] ; then
-				echo "$a: replacing and keeping the old version as $a.old"
-				mv $DEST/$a $DEST/$a.old
-				cp $a $DEST/$a
+				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
 			else
-				echo "$a: installing the new version as $a.dist"
-				cp $a $DEST/$a.dist
+				echo "cf/$a: installing the new version as cf/$a.dist"
+				cp run/cf/$a $DEST/cf/$a.dist
 			fi
 		fi
 	fi