X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=build%2Finstaller;h=b06ca50947c45b4e5b89301abd27284f3ac16c5b;hb=35257848f97710b8107e20f690404cfaf0838f74;hp=02eb25524ba258cce88853c5a35fde7a9680f21b;hpb=2ca65d9ea1b986a17d7afecfeb19bf4de854b209;p=libucw.git

diff --git a/build/installer b/build/installer
index 02eb2552..b06ca509 100755
--- a/build/installer
+++ b/build/installer
@@ -2,31 +2,38 @@
 set -e
 DEST=`eval echo $1`
 echo "Installing to $DEST"
-if [ ! -d $DEST/bin ] ; then
-	echo "Creating $DEST and the whole directory hierarchy under it."
-	mkdir -p $DEST/{bin,cf,db,index,log,tmp}
-fi
-echo "Installing binaries..."
-rm -f $DEST/bin/*
-cp run/bin/* $DEST/bin/
+for d in "" cf $SH_EXTRA_RUNDIRS ; do
+	if [ ! -d $DEST/$d ] ; then
+		echo "Creating $DEST/$d"
+		mkdir -p $DEST/$d
+	fi
+done
+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 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