[Yanel-development] [PATCH] Shell scripts cleanup
Andreas Wuest
awuest at student.ethz.ch
Wed Nov 1 22:40:31 CET 2006
Hi
I've cleaned up the following shell scripts a bit: build.sh,
configure.sh and yanel.sh.
What I've done:
* If JAVA_HOME is not set, the shell script gives bad advice for MacOS
X users. JAVA_HOME should be set to
/System/Library/Frameworks/JavaVM.framework/Home.
* Removed the saving of original paths and their restoration. Since
the script runs in a subshell (/bin/sh), changing environment variables
does not affect parent shells. Furthermore, it was not done consistently
anyway.
Since I don't have SVN write permissions for Yanel I've attached the
diffs for the 3 files.
--
Kind regards,
Andi
-------------- next part --------------
Index: trunk/build.sh
===================================================================
--- trunk/build.sh (revision 19762)
+++ trunk/build.sh (working copy)
@@ -9,7 +9,7 @@
if [ "$JAVA_HOME" = "" ];then
echo "ERROR: No JAVA_HOME set!"
echo " Have you installed JDK (Java Development Kit)? If so, then set JAVA_HOME ..."
- echo " MacOS X : setenv JAVA_HOME /usr"
+ echo " MacOS X : setenv JAVA_HOME /System/Library/Frameworks/JavaVM.framework/Home"
echo " Linux : export JAVA_HOME=/usr/local/j2sdk-..."
echo " Windows : Click Start ..."
exit 1
@@ -19,22 +19,14 @@
# TODO: ....
# ----- Set Environment Variables
-ORIGINAL_ANT_HOME=$ANT_HOME
unset ANT_HOME
ANT_HOME=$PWD/tools/apache-ant-1.6.5
#echo $ANT_HOME
-ORIGINAL_PATH=$PATH
PATH=$PWD/tools/maven-2.0.4/bin:$ANT_HOME/bin:$PATH
#echo $PATH
-# ----- Build Yanel ...
+# ----- Build Yanel
#mvn --version
ant -version
ant -f src/build/build.xml $@
-
-# ----- Reset Environment Variables
-ANT_HOME=$ORIGINAL_ANT_HOME
-#echo $ANT_HOME
-PATH=$ORIGINAL_PATH
-#echo $PATH
-------------- next part --------------
Index: trunk/configure.sh
===================================================================
--- trunk/configure.sh (revision 19762)
+++ trunk/configure.sh (working copy)
@@ -9,7 +9,7 @@
if [ "$JAVA_HOME" = "" ];then
echo "ERROR: No JAVA_HOME set!"
echo " Have you installed JDK (Java Development Kit)? If so, then set JAVA_HOME ..."
- echo " MacOS X : setenv JAVA_HOME /usr"
+ echo " MacOS X : setenv JAVA_HOME /System/Library/Frameworks/JavaVM.framework/Home"
echo " Linux : export JAVA_HOME=/usr/local/j2sdk-..."
echo " Windows : Click Start, click 'My Computer', right click on window, select 'Properties', click the 'Advanced' tab, click 'Environment Variables'"
exit 1
@@ -19,22 +19,14 @@
# TODO: ....
# ----- Set Environment Variables
-ORIGINAL_ANT_HOME=$ANT_HOME
unset ANT_HOME
ANT_HOME=$PWD/tools/apache-ant-1.6.5
#echo $ANT_HOME
-ORIGINAL_PATH=$PATH
PATH=$PWD/tools/maven-2.0.4/bin:$ANT_HOME/bin:$PATH
#echo $PATH
-# ----- Do something ;-)
+# ----- Configure Yanel
ant -version
#mvn --version
ant -f src/build/build.xml config
-
-# ----- Reset Environment Variables
-ANT_HOME=$ORIGINAL_ANT_HOME
-#echo $ANT_HOME
-PATH=$ORIGINAL_PATH
-#echo $PATH
-------------- next part --------------
Index: trunk/yanel.sh
===================================================================
--- trunk/yanel.sh (revision 19762)
+++ trunk/yanel.sh (working copy)
@@ -7,23 +7,21 @@
if [ "$JAVA_HOME" = "" ];then
echo "ERROR: No JAVA_HOME set!"
echo " Have you installed JDK (Java Development Kit)? If so, then set JAVA_HOME ..."
- echo " MacOS X : setenv JAVA_HOME /usr"
+ echo " MacOS X : setenv JAVA_HOME /System/Library/Frameworks/JavaVM.framework/Home"
echo " Linux : export JAVA_HOME=/usr/local/j2sdk-..."
echo " Windows : Click Start ..."
exit 1
fi
# ----- Set Environment Variables
-ORIGINAL_ANT_HOME=$ANT_HOME
unset ANT_HOME
ANT_HOME=$PWD/tools/apache-ant-1.6.5
#echo $ANT_HOME
-ORIGINAL_PATH=$PATH
PATH=$PWD/tools/maven-2.0.4/bin:$ANT_HOME/bin:$PATH
#echo $PATH
-# ----- Build Yanel ...
+# ----- Start/Stop Yanel
#mvn --version
ant -version
ant -f src/build/build.xml run-yanel-cmdl -Dyanel.path=$1
More information about the Yanel-development
mailing list