[Pkg-voip-commits] r3005 - in asterisk: tags/1.2.14~dfsg-2/debian trunk/debian

[Kilian Krause]

Author: kilian
Date: 2007-01-13 12:29:33 +0100 (Sat, 13 Jan 2007)
New Revision: 3005

Modified:
   asterisk/tags/1.2.14~dfsg-2/debian/asterisk_fix
   asterisk/trunk/debian/asterisk_fix
Log:
the "make install" already creates target dir. Need to make sure the hard way.


Modified: asterisk/tags/1.2.14~dfsg-2/debian/asterisk_fix
===================================================================
--- asterisk/tags/1.2.14~dfsg-2/debian/asterisk_fix	2007-01-13 11:22:04 UTC (rev 3004)
+++ asterisk/tags/1.2.14~dfsg-2/debian/asterisk_fix	2007-01-13 11:29:33 UTC (rev 3005)
@@ -27,12 +27,8 @@
 #             /var/lib/asterisk/sounds/priv-callerintros
 if [ -d /usr/share/asterisk/sounds/priv-callerintros ];then
 	echo "Updating private callerinfos location to /var/lib/asterisk/sounds/priv-callerintros."
-	if [ ! -d /var/lib/asterisk/sounds/priv-callerintros ];then
-		mv /usr/share/asterisk/sounds/priv-callerintros /var/lib/asterisk/sounds/priv-callerintros
-	else
-		echo "Directory /var/lib/asterisk/sounds/priv-callerintros already exists. Please"
-		echo "move files from /usr/share/asterisk/sounds/priv-callerintros yourself and"
-		echo "remove /usr/share/asterisk/sounds/priv-callerintros manually."
+	if [ `find /usr/share/asterisk/sounds/priv-callerintros -mindepth 1|wc -l` -gt 0 ];then
+		mv /usr/share/asterisk/sounds/priv-callerintros/* /var/lib/asterisk/sounds/priv-callerintros
 	fi
 fi
 

Modified: asterisk/trunk/debian/asterisk_fix
===================================================================
--- asterisk/trunk/debian/asterisk_fix	2007-01-13 11:22:04 UTC (rev 3004)
+++ asterisk/trunk/debian/asterisk_fix	2007-01-13 11:29:33 UTC (rev 3005)
@@ -27,12 +27,8 @@
 #             /var/lib/asterisk/sounds/priv-callerintros
 if [ -d /usr/share/asterisk/sounds/priv-callerintros ];then
 	echo "Updating private callerinfos location to /var/lib/asterisk/sounds/priv-callerintros."
-	if [ ! -d /var/lib/asterisk/sounds/priv-callerintros ];then
-		mv /usr/share/asterisk/sounds/priv-callerintros /var/lib/asterisk/sounds/priv-callerintros
-	else
-		echo "Directory /var/lib/asterisk/sounds/priv-callerintros already exists. Please"
-		echo "move files from /usr/share/asterisk/sounds/priv-callerintros yourself and"
-		echo "remove /usr/share/asterisk/sounds/priv-callerintros manually."
+	if [ `find /usr/share/asterisk/sounds/priv-callerintros -mindepth 1|wc -l` -gt 0 ];then
+		mv /usr/share/asterisk/sounds/priv-callerintros/* /var/lib/asterisk/sounds/priv-callerintros
 	fi
 fi