projects
/
feisty_meow.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
58692c2
)
zazzed up the output a bit.
author
Chris Koeritz
<fred@gruntose.com>
Sun, 12 Feb 2012 20:50:14 +0000
(15:50 -0500)
committer
Chris Koeritz
<fred@gruntose.com>
Sun, 12 Feb 2012 20:50:14 +0000
(15:50 -0500)
examples/custom_overrides/fred/java_profile.sh
patch
|
blob
|
history
diff --git
a/examples/custom_overrides/fred/java_profile.sh
b/examples/custom_overrides/fred/java_profile.sh
index 94c40f868c57e06984b3d9be9cb57f1503114b8b..50e2c290b296dd41afb7fdb4fa426828a6f959a3 100644
(file)
--- a/
examples/custom_overrides/fred/java_profile.sh
+++ b/
examples/custom_overrides/fred/java_profile.sh
@@
-6,10
+6,12
@@
############################
############################
+# this reports when we have totally failed to figure out where a folder
+# is actually located on the machine.
function intuition_failure()
{
missing="$1"; shift
function intuition_failure()
{
missing="$1"; shift
- echo "
We cannot intuit your $missing variable for this host
."
+ echo "
Could not intuit '$missing' variable
."
# remove the variable because its value is busted.
unset $missing
}
# remove the variable because its value is busted.
unset $missing
}
@@
-59,13
+61,9
@@
if [ ! -d "$JAVA_HOME" ]; then
JAVA_BIN_PIECE=Commands
fi
# last thing is to tell them we couldn't find it.
JAVA_BIN_PIECE=Commands
fi
# last thing is to tell them we couldn't find it.
-if [ ! -d "$JAVA_HOME" ]; then
- if [ ! -z "$(which java)" ]; then
- echo "okay, java is in the path (JAVA_HOME unknown)."
- else
- intuition_failure JAVA_HOME
- unset JAVA_BIN_PIECE
- fi
+if [ ! -d "$JAVA_HOME" -a -z "$(which java)" ]; then
+ intuition_failure JAVA_HOME
+ unset JAVA_BIN_PIECE
fi
############################
fi
############################
@@
-94,12
+92,8
@@
if [ ! -d "$ECLIPSE_DIR" ]; then
ECLIPSE_DIR="/e/tools/eclipse"
fi
# final option is to whine.
ECLIPSE_DIR="/e/tools/eclipse"
fi
# final option is to whine.
-if [ ! -d "$ECLIPSE_DIR" ]; then
- if [ ! -z "$(which eclipse)" ]; then
- echo "okay, eclipse is in the path (ECLIPSE_DIR unknown)."
- else
- intuition_failure ECLIPSE_DIR;
- fi
+if [ ! -d "$ECLIPSE_DIR" -a -z "$(which eclipse)" ]; then
+ intuition_failure ECLIPSE_DIR
fi
############################
fi
############################