summarylogtreecommitdiffstats
path: root/fix_opt.patch
diff options
context:
space:
mode:
authorJake Merdich2018-05-27 20:25:21 -0400
committerJake Merdich2018-05-27 20:29:57 -0400
commitb19028df2606fbdfb057533b11335e926570c3f9 (patch)
tree66d8298313760fcbf343898b5eb653e72d56699e /fix_opt.patch
downloadaur-fmpp.tar.gz
Initial commit
Diffstat (limited to 'fix_opt.patch')
-rw-r--r--fix_opt.patch67
1 files changed, 67 insertions, 0 deletions
diff --git a/fix_opt.patch b/fix_opt.patch
new file mode 100644
index 000000000000..76bc14bb531a
--- /dev/null
+++ b/fix_opt.patch
@@ -0,0 +1,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