From 7876831b338ec827cffda6792ef77f444b18eb6e Mon Sep 17 00:00:00 2001 From: Chris Koeritz Date: Wed, 7 Mar 2012 17:03:57 -0500 Subject: [PATCH] not adding eclipse and java at front of path, since they don't need to be there. fixed functions some more for @(#*(@*#(*@$&*(@$& windows and @*&#*&@!#*&!@#(*@# cygwin. --- examples/custom_overrides/fred/java_profile.sh | 4 ++-- scripts/core/functions.sh | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/custom_overrides/fred/java_profile.sh b/examples/custom_overrides/fred/java_profile.sh index 1cfca8f0..72709c67 100755 --- a/examples/custom_overrides/fred/java_profile.sh +++ b/examples/custom_overrides/fred/java_profile.sh @@ -116,14 +116,14 @@ if [ ! -z "$JAVA_HOME" ]; then if [ ! -z "$(uname -a | grep -i cygwin)" ]; then j=$(echo $j | sed -e 's/^\(.\):/\/cygdrive\/\1/') fi - export PATH=$j/$JAVA_BIN_PIECE:$PATH + export PATH=$PATH:$j/$JAVA_BIN_PIECE fi if [ ! -z "$ECLIPSE_DIR" ]; then e="$ECLIPSE_DIR" if [ ! -z "$(uname -a | grep -i cygwin)" ]; then e=$(echo $e | sed -e 's/^\(.\):/\/cygdrive\/\1/') fi - export PATH=$e:$PATH + export PATH=$PATH:$e fi ############################ diff --git a/scripts/core/functions.sh b/scripts/core/functions.sh index 1a0cc10b..d5ab21e1 100644 --- a/scripts/core/functions.sh +++ b/scripts/core/functions.sh @@ -64,9 +64,9 @@ if [ -z "$skip_all" ]; then | grep -i "$i" \ | sed -n -e "$appropriate_pattern") if [ ${#PIDS_SOUGHT[*]} -ne 0 ]; then - # we want to bail as soon as we get matches, because on the same - # platform, the same set of patterns should work to find all - # occurrences of the genesis java. + # we want to bail as soon as we get matches, because on the same + # platform, the same set of patterns should work to find all + # occurrences of the genesis java. break; fi done @@ -83,9 +83,9 @@ if [ -z "$skip_all" ]; then | grep -i "$i" \ | sed -n -e "$appropriate_pattern") if [ ${#PIDS_SOUGHT[*]} -ne 0 ]; then - # we want to bail as soon as we get matches, because on the same - # platform, the same set of patterns should work to find all - # occurrences of the genesis java. + # we want to bail as soon as we get matches, because on the same + # platform, the same set of patterns should work to find all + # occurrences of the genesis java. break; fi done -- 2.34.1