Author: toad
Date: 2007-09-26 15:51:33 +0000 (Wed, 26 Sep 2007)
New Revision: 15329
Modified:
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_startup_hook-mac.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:
> /dev/null 2>&1 not other way around
remove an unnecessary output redirection
remove an extra >
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 15:47:01 UTC (rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh
2007-09-26 15:51:33 UTC (rev 15329)
@@ -7,5 +7,5 @@
if test ! -e offline
then
echo "Downloading freenet-ext.jar"
- java -jar bin/sha1test.jar freenet-ext.jar "$INSTALL_PATH" 2>&1
>/dev/null || exit 1
+ java -jar bin/sha1test.jar freenet-ext.jar "$INSTALL_PATH" >/dev/null
2>&1 || 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 15:47:01 UTC (rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh
2007-09-26 15:51:33 UTC (rev 15329)
@@ -7,8 +7,8 @@
if test ! -e offline
then
echo "Downloading freenet-stable-latest.jar"
- java -jar bin/sha1test.jar freenet-stable-latest.jar "$INSTALL_PATH"
2>&1 >/dev/null || exit 1
+ java -jar bin/sha1test.jar freenet-stable-latest.jar "$INSTALL_PATH"
>/dev/null 2>&1 || exit 1
fi
rm -f freenet.jar
-ln -sf freenet-stable-latest.jar freenet.jar 2>&1 >/dev/null
+ln -sf freenet-stable-latest.jar 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
15:47:01 UTC (rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/install_frost.sh 2007-09-26
15:51:33 UTC (rev 15329)
@@ -10,9 +10,9 @@
if test ! -e offline
then
echo "Downloading frost"
- java -jar bin/sha1test.jar frost/frost.zip ./ 2>&1 >/dev/null
|| exit 1
+ java -jar bin/sha1test.jar frost/frost.zip ./ >/dev/null 2>&1
|| exit 1
fi
echo "Unzipping frost"
mkdir frost
- java -jar bin/uncompress.jar frost.zip frost 2>&1 >/dev/null
+ java -jar bin/uncompress.jar frost.zip frost >/dev/null 2>&1
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
15:47:01 UTC (rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2007-09-26
15:51:33 UTC (rev 15329)
@@ -11,6 +11,6 @@
then
echo "Downloading jSite"
mkdir jSite
- java -jar bin/sha1test.jar jSite/jSite.jar jSite 2>&1
>/dev/null || exit 1
+ java -jar bin/sha1test.jar jSite/jSite.jar jSite >/dev/null
2>&1 || 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
15:47:01 UTC (rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2007-09-26
15:51:33 UTC (rev 15329)
@@ -13,7 +13,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins
2>&1 >/dev/null
+ java -jar bin/sha1test.jar plugins/Librarian.jar.url plugins
>/dev/null 2>&1
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
15:47:01 UTC (rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2007-09-26
15:51:33 UTC (rev 15329)
@@ -13,7 +13,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url
plugins 2>&1 >/dev/null
+ java -jar bin/sha1test.jar plugins/MDNSDiscovery.jar.url
plugins >/dev/null 2>&1
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_startup_hook-mac.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh
2007-09-26 15:47:01 UTC (rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh
2007-09-26 15:51:33 UTC (rev 15329)
@@ -11,10 +11,10 @@
if test ! -d $STARTUP_PATH
then
- mkdir $STARTUP_PATH 2>&1 > >/dev/null
+ mkdir $STARTUP_PATH >/dev/null 2>&1
fi
-mkdir $STARTUP_PATH/Freenet 2>&1 > >/dev/null
+mkdir $STARTUP_PATH/Freenet >/dev/null 2>&1
rm -f $SCRIPT
echo "#!/bin/sh" >> $SCRIPT
echo ". /etc/rc.common" >> $SCRIPT
Modified: trunk/apps/new_installer/res/unix/bin/install_stun.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_stun.sh 2007-09-26
15:47:01 UTC (rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/install_stun.sh 2007-09-26
15:51:33 UTC (rev 15329)
@@ -13,7 +13,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins 2>&1
>/dev/null
+ java -jar bin/sha1test.jar plugins/JSTUN.jar.url plugins
>/dev/null 2>&1
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
15:47:01 UTC (rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2007-09-26
15:51:33 UTC (rev 15329)
@@ -11,6 +11,6 @@
then
echo "Downloading Thaw"
mkdir Thaw
- java -jar bin/sha1test.jar Thaw/Thaw.jar Thaw 2>&1 >/dev/null
|| exit 1
+ java -jar bin/sha1test.jar Thaw/Thaw.jar Thaw >/dev/null 2>&1
|| 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
15:47:01 UTC (rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/install_updater.sh 2007-09-26
15:51:33 UTC (rev 15329)
@@ -16,6 +16,6 @@
if test ! -e offline
then
echo "Downloading update.sh"
- java -jar bin/sha1test.jar update/update.sh 2>&1 >/dev/null || exit 1
+ java -jar bin/sha1test.jar update/update.sh >/dev/null 2>&1 || 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
15:47:01 UTC (rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2007-09-26
15:51:33 UTC (rev 15329)
@@ -13,7 +13,7 @@
mv -f plug2 plug
if test ! -e offline
then
- java -jar bin/sha1test.jar plugins/UPnP.jar.url plugins 2>&1
>/dev/null
+ java -jar bin/sha1test.jar plugins/UPnP.jar.url plugins
>/dev/null 2>&1
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 15:47:01 UTC
(rev 15328)
+++ trunk/apps/new_installer/res/unix/bin/setup.sh 2007-09-26 15:51:33 UTC
(rev 15329)
@@ -14,7 +14,7 @@
touch plug
# We need the exec flag on /bin
-chmod u+x bin/*sh bin/wrapper-* lib/* 2>&1 >/dev/null
+chmod u+x bin/*sh bin/wrapper-* lib/* >/dev/null 2>&1
# Are we in offline mode ?
if test -e offline
