blob: 76bc14bb531a9a90a1721b7f2b25df470cc901a9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
diff --git a/bin/fmpp b/bin/fmpp
index 35cdd33..50a49d1 100644
--- a/bin/fmpp
+++ b/bin/fmpp
@@ -39,36 +39,34 @@ if [ -z "$FMPP_HOME" ] ; then
# try to find FMPP
if [ -d /opt/fmpp ] ; then
FMPP_HOME=/opt/fmpp
- fi
-
- if [ -d "${HOME}/opt/fmpp" ] ; then
+ elif [ -d "${HOME}/opt/fmpp" ] ; then
FMPP_HOME="${HOME}/opt/fmpp"
+ else
+ ## resolve links - $0 may be a link to FMPP's home
+ PRG="$0"
+ progname=`basename "$0"`
+ saveddir=`pwd`
+
+ # need this for relative symlinks
+ cd `dirname "$PRG"`
+
+ while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '.*/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+ done
+
+ FMPP_HOME=`dirname "$PRG"`/..
+
+ cd "$saveddir"
+
+ # make it fully qualified
+ FMPP_HOME=`cd "$FMPP_HOME" && pwd`
fi
-
- ## resolve links - $0 may be a link to FMPP's home
- PRG="$0"
- progname=`basename "$0"`
- saveddir=`pwd`
-
- # need this for relative symlinks
- cd `dirname "$PRG"`
-
- while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '.*/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
- done
-
- FMPP_HOME=`dirname "$PRG"`/..
-
- cd "$saveddir"
-
- # make it fully qualified
- FMPP_HOME=`cd "$FMPP_HOME" && pwd`
fi
# For Cygwin, ensure paths are in UNIX format before anything is touched
|