Author: nextgens
Date: 2007-09-26 11:48:35 +0000 (Wed, 26 Sep 2007)
New Revision: 15316
Modified:
trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
trunk/apps/new_installer/res/unix/bin/install_frost.sh
trunk/apps/new_installer/res/unix/bin/install_jSite.sh
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_thaw.sh
trunk/apps/new_installer/res/unix/bin/install_updater.sh
trunk/apps/new_installer/res/unix/bin/install_upnp.sh
trunk/apps/new_installer/res/unix/bin/setup.sh
Log:
new_installer: &> seems to be a bashism
Modified: trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
2007-09-26 11:19:03 UTC (rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
2007-09-26 11:48:35 UTC (rev 15316)
@@ -7,7 +7,7 @@
echo "Detecting tcp-ports availability..."
# Try to auto-detect the first available port for fproxy
FPROXY_PORT=8888
-java -jar bin/bindtest.jar $FPROXY_PORT &>/dev/null
+java -jar bin/bindtest.jar $FPROXY_PORT 2>&1/dev/null
if test $? -ne 0
then
FPROXY_PORT=8889
Modified: trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
2007-09-26 11:19:03 UTC (rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
2007-09-26 11:48:35 UTC (rev 15316)
@@ -7,5 +7,5 @@
if test ! -e offline
then
echo "Downloading freenet-ext.jar"
- java -jar bin/sha1test.jar freenet-ext.jar "$INSTALL_PATH" &>/dev/null
|| exit 1
+ java -jar bin/sha1test.jar freenet-ext.jar "$INSTALL_PATH"
2>&1/dev/null || exit 1
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
2007-09-26 11:19:03 UTC (rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
2007-09-26 11:48:35 UTC (rev 15316)
@@ -7,7 +7,7 @@
if test ! -e offline
then
echo "Downloading freenet-stable-latest.jar"
- java -jar bin/sha1test.jar freenet-stable-latest.jar "$INSTALL_PATH"
&>/dev/null || exit 1
+ java -jar bin/sha1test.jar freenet-stable-latest.jar "$INSTALL_PATH"
2>&1/dev/null || exit 1
fi
rm -f freenet.jar
Modified: trunk/apps/new_installer/res/unix/bin/install_frost.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_frost.sh 2007-09-26
11:19:03 UTC (rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/install_frost.sh 2007-09-26
11:48:35 UTC (rev 15316)
@@ -10,9 +10,9 @@
if test ! -e offline
then
echo "Downloading frost"
- java -jar bin/sha1test.jar frost/frost.zip ./ &>/dev/null ||
exit 1
+ java -jar bin/sha1test.jar frost/frost.zip ./ 2>&1/dev/null ||
exit 1
fi
echo "Unzipping frost"
mkdir frost
- java -jar bin/uncompress.jar frost.zip frost &>/dev/null
+ java -jar bin/uncompress.jar frost.zip frost 2>&1/dev/null
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_jSite.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2007-09-26
11:19:03 UTC (rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2007-09-26
11:48:35 UTC (rev 15316)
@@ -11,6 +11,6 @@
then
echo "Downloading jSite"
mkdir jSite
- java -jar bin/sha1test.jar jSite/jSite.jar jSite &>/dev/null ||
exit 1
+ java -jar bin/sha1test.jar jSite/jSite.jar jSite 2>&1/dev/null
|| exit 1
fi
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2007-09-26
11:19:03 UTC (rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2007-09-26
11:48:35 UTC (rev 15316)
@@ -7,13 +7,13 @@
if test -e librarian -a -e plug
then
echo "Enabling the Librarian plugin"
- mkdir -p plugins &>/dev/null
+ mkdir -p plugins 2>&1/dev/null
PLUGINS="`cat plug`"
echo "plugins.Librarian.Librarian at
file://$INSTALL_PATH/plugins/Librarian.jar;$PLUGINS" > plug2
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins
&>/dev/null
+ java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins
2>&1/dev/null
fi
mv -f plugins/Librarian.jar.url plugins/Librarian.jar
rm -f plugins/Librarian.jar.url
Modified: trunk/apps/new_installer/res/unix/bin/install_mdns.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2007-09-26
11:19:03 UTC (rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2007-09-26
11:48:35 UTC (rev 15316)
@@ -7,13 +7,13 @@
if test -e mdns -a -e plug
then
echo "Enabling the MDNSDiscovery plugin"
- mkdir -p plugins &>/dev/null
+ mkdir -p plugins 2>&1/dev/null
PLUGINS="`cat plug`"
echo "plugins.MDNSDiscovery.MDNSDiscovery at
file://$INSTALL_PATH/plugins/MDNSDiscovery.jar;$PLUGINS" > plug2
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url
plugins &>/dev/null
+ java -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url
plugins 2>&1/dev/null
fi
mv -f plugins/MDNSDiscovery.jar.url plugins/MDNSDiscovery.jar
rm -f plugins/MDNSDiscovery.jar.url
Modified: trunk/apps/new_installer/res/unix/bin/install_stun.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_stun.sh 2007-09-26
11:19:03 UTC (rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/install_stun.sh 2007-09-26
11:48:35 UTC (rev 15316)
@@ -7,13 +7,13 @@
if test -e stun -a -e plug
then
echo "Enabling the STUN plugin"
- mkdir -p plugins &>/dev/null
+ mkdir -p plugins 2>&1/dev/null
PLUGINS="`cat plug`"
echo "plugins.JSTUN.JSTUN at
file://$INSTALL_PATH/plugins/JSTUN.jar;$PLUGINS" > plug2
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins
&>/dev/null
+ java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins
2>&1/dev/null
fi
mv -f plugins/JSTUN.jar.url plugins/JSTUN.jar
rm -f plugins/JSTUN.jar.url
Modified: trunk/apps/new_installer/res/unix/bin/install_thaw.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2007-09-26
11:19:03 UTC (rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2007-09-26
11:48:35 UTC (rev 15316)
@@ -11,6 +11,6 @@
then
echo "Downloading Thaw"
mkdir Thaw
- java -jar bin/sha1test.jar Thaw/Thaw.jar Thaw &>/dev/null ||
exit 1
+ java -jar bin/sha1test.jar Thaw/Thaw.jar Thaw 2>&1/dev/null ||
exit 1
fi
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_updater.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_updater.sh 2007-09-26
11:19:03 UTC (rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/install_updater.sh 2007-09-26
11:48:35 UTC (rev 15316)
@@ -16,6 +16,6 @@
if test ! -e offline
then
echo "Downloading update.sh"
- java -jar bin/sha1test.jar update/update.sh &>/dev/null || exit 1
+ java -jar bin/sha1test.jar update/update.sh 2>&1/dev/null || exit 1
fi
chmod a+rx update.sh
Modified: trunk/apps/new_installer/res/unix/bin/install_upnp.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2007-09-26
11:19:03 UTC (rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2007-09-26
11:48:35 UTC (rev 15316)
@@ -7,13 +7,13 @@
if test -e upnp -a -e plug
then
echo "Enabling the UP&P plugin"
- mkdir -p plugins &>/dev/null
+ mkdir -p plugins 2>&1/dev/null
PLUGINS="`cat plug`"
echo "plugins.UPnP.UPnP at
file://$INSTALL_PATH/plugins/UPnP.jar;$PLUGINS" > plug2
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/UPnP.jar.url plugins
&>/dev/null
+ java -jar bin/sha1test.jar plugins/UPnP.jar.url plugins
2>&1/dev/null
fi
mv -f plugins/UPnP.jar.url plugins/UPnP.jar
rm -f plugins/UPnP.jar.url
Modified: trunk/apps/new_installer/res/unix/bin/setup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/setup.sh 2007-09-26 11:19:03 UTC
(rev 15315)
+++ trunk/apps/new_installer/res/unix/bin/setup.sh 2007-09-26 11:48:35 UTC
(rev 15316)
@@ -14,7 +14,7 @@
touch plug
# We need the exec flag on /bin
-chmod u+x bin/*sh bin/wrapper-* lib/* &>/dev/null
+chmod u+x bin/*sh bin/wrapper-* lib/* 2>&1/dev/null
# Are we in offline mode ?
if test -e offline
