[freenet-cvs] r14671 - trunk/apps/new_installer/res/unix/bin

[nextgens at freenetproject.org]

Author: nextgens
Date: 2007-08-13 22:12:44 +0000 (Mon, 13 Aug 2007)
New Revision: 14671

Modified:
   trunk/apps/new_installer/res/unix/bin/install_librarian.sh
   trunk/apps/new_installer/res/unix/bin/install_mdns.sh
   trunk/apps/new_installer/res/unix/bin/install_stun.sh
   trunk/apps/new_installer/res/unix/bin/install_upnp.sh
Log:
new_installer: silent some harmless errors

Modified: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_librarian.sh	2007-08-13 22:09:25 UTC (rev 14670)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh	2007-08-13 22:12:44 UTC (rev 14671)
@@ -7,7 +7,7 @@
 if test -e librarian -a -e plug
 then
 	echo "Enabling the Librarian plugin"
-	mkdir plugins &>/dev/null
+	mkdir -p plugins &>/dev/null
 	PLUGINS="`cat plug`"
 	echo "plugins.Librarian.Librarian at file://$INSTALL_PATH/plugins/Librarian.jar;$PLUGINS" > plug2
 	mv -f plug2 plug
@@ -15,7 +15,7 @@
 	then
 		java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins &>/dev/null
 	fi
-	mv plugins/Librarian.jar.url plugins/Librarian.jar
+	mv -f plugins/Librarian.jar.url plugins/Librarian.jar
 	rm -f plugins/Librarian.jar.url
 	rm -f librarian
 fi

Modified: trunk/apps/new_installer/res/unix/bin/install_mdns.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_mdns.sh	2007-08-13 22:09:25 UTC (rev 14670)
+++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh	2007-08-13 22:12:44 UTC (rev 14671)
@@ -7,7 +7,7 @@
 if test -e mdns -a -e plug
 then
 	echo "Enabling the MDNSDiscovery plugin"
-	mkdir plugins &>/dev/null
+	mkdir -p plugins &>/dev/null
 	PLUGINS="`cat plug`"
 	echo "plugins.MDNSDiscovery.MDNSDiscovery at file://$INSTALL_PATH/plugins/MDNSDiscovery.jar;$PLUGINS" > plug2
 	mv -f plug2 plug
@@ -15,7 +15,7 @@
 	then
 		java -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url plugins &>/dev/null
 	fi
-	mv plugins/MDNSDiscovery.jar.url plugins/MDNSDiscovery.jar
+	mv -f plugins/MDNSDiscovery.jar.url plugins/MDNSDiscovery.jar
 	rm -f plugins/MDNSDiscovery.jar.url
 	rm -f mdns
 fi

Modified: trunk/apps/new_installer/res/unix/bin/install_stun.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_stun.sh	2007-08-13 22:09:25 UTC (rev 14670)
+++ trunk/apps/new_installer/res/unix/bin/install_stun.sh	2007-08-13 22:12:44 UTC (rev 14671)
@@ -7,7 +7,7 @@
 if test -e stun -a -e plug
 then
 	echo "Enabling the STUN plugin"
-	mkdir plugins &>/dev/null
+	mkdir -p plugins &>/dev/null
 	PLUGINS="`cat plug`"
 	echo "plugins.JSTUN.JSTUN at file://$INSTALL_PATH/plugins/JSTUN.jar;$PLUGINS" > plug2
 	mv -f plug2 plug
@@ -15,7 +15,7 @@
 	then
 		java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins &>/dev/null
 	fi
-	mv plugins/JSTUN.jar.url plugins/JSTUN.jar
+	mv -f plugins/JSTUN.jar.url plugins/JSTUN.jar
 	rm -f plugins/JSTUN.jar.url
 	rm -f stun
 fi

Modified: trunk/apps/new_installer/res/unix/bin/install_upnp.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_upnp.sh	2007-08-13 22:09:25 UTC (rev 14670)
+++ trunk/apps/new_installer/res/unix/bin/install_upnp.sh	2007-08-13 22:12:44 UTC (rev 14671)
@@ -7,7 +7,7 @@
 if test -e upnp -a -e plug
 then
 	echo "Enabling the UP&P plugin"
-	mkdir plugins &>/dev/null
+	mkdir -p plugins &>/dev/null
 	PLUGINS="`cat plug`"
 	echo "plugins.UPnP.UPnP at file://$INSTALL_PATH/plugins/UPnP.jar;$PLUGINS" > plug2
 	mv -f plug2 plug
@@ -15,7 +15,7 @@
 	then
 		java -jar bin/sha1test.jar plugins/UPnP.jar.url plugins &>/dev/null
 	fi
-	mv plugins/UPnP.jar.url plugins/UPnP.jar
+	mv -f plugins/UPnP.jar.url plugins/UPnP.jar
 	rm -f plugins/UPnP.jar.url
 	rm -f upnp
 fi