Revert "FIXED: Fix PATH in convenience scripts"

diff --git a/scripts/markdown b/scripts/markdown
index 19a0d3973836a7afe8127511e9bd1bafe726deac..f59c5db80c7faab05fda6d37e6fb8925f606002e 100755 (executable)
--- a/scripts/markdown
+++ b/scripts/markdown
@@ -8,17 +8,7 @@
 #
 
 # Be sure to include multimarkdown in our PATH
-unset CDPATH
-SCRIPT="$0"
-while
-       DIR="$(cd -P -- "$(dirname -- "$SCRIPT")" && pwd)"
-       test -h "$SCRIPT"
-do
-       SCRIPT="$(readlink "$SCRIPT")"
-       [ "$SCRIPT" = "${SCRIPT#/}" ] && SCRIPT="$DIR/$SCRIPT"
-done
-PATH="$DIR:/usr/local/bin:$PATH"
-export PATH
+export PATH="$PWD:/usr/local/bin:$PATH"
 
 which multimarkdown > /dev/null
 if [ $? = 1 ]

diff --git a/scripts/mmd b/scripts/mmd
index a1a6aa7a1003ce93e2b385964b220964a0f04518..6f37362b731a7cba61d62b6713fe07bd18701153 100755 (executable)
--- a/scripts/mmd
+++ b/scripts/mmd
@@ -8,17 +8,7 @@
 #
 
 # Be sure to include multimarkdown in our PATH
-unset CDPATH
-SCRIPT="$0"
-while
-       DIR="$(cd -P -- "$(dirname -- "$SCRIPT")" && pwd)"
-       test -h "$SCRIPT"
-do
-       SCRIPT="$(readlink "$SCRIPT")"
-       [ "$SCRIPT" = "${SCRIPT#/}" ] && SCRIPT="$DIR/$SCRIPT"
-done
-PATH="$DIR:/usr/local/bin:$PATH"
-export PATH
+export PATH="$PWD:/usr/local/bin:$PATH"
 
 which multimarkdown > /dev/null
 if [ $? = 1 ]

diff --git a/scripts/mmd2all b/scripts/mmd2all
index 0c12310b9486af8150d689cfa3a1f3e1693352ba..94b89875156f8080780750b387069beca804393e 100755 (executable)
--- a/scripts/mmd2all
+++ b/scripts/mmd2all
@@ -9,17 +9,7 @@
 #
 
 # Be sure to include multimarkdown in our PATH
-unset CDPATH
-SCRIPT="$0"
-while
-       DIR="$(cd -P -- "$(dirname -- "$SCRIPT")" && pwd)"
-       test -h "$SCRIPT"
-do
-       SCRIPT="$(readlink "$SCRIPT")"
-       [ "$SCRIPT" = "${SCRIPT#/}" ] && SCRIPT="$DIR/$SCRIPT"
-done
-PATH="$DIR:/usr/local/bin:$PATH"
-export PATH
+export PATH="$PWD:/usr/local/bin:$PATH"
 
 which multimarkdown > /dev/null
 if [ $? = 1 ]

diff --git a/scripts/mmd2epub b/scripts/mmd2epub
index 7643541d4f4d0b1eea655b18d1161dc58fb315cb..11f77976d58163c544c29bdabd03811a53b1e21e 100755 (executable)
--- a/scripts/mmd2epub
+++ b/scripts/mmd2epub
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# mmd2epub --- MultiMarkdown convenience script
+# mmd2oepub --- MultiMarkdown convenience script
 #      <http://fletcherpenney.net/multimarkdown/>
 #      Fletcher T. Penney
 #
@@ -8,17 +8,7 @@
 #
 
 # Be sure to include multimarkdown in our PATH
-unset CDPATH
-SCRIPT="$0"
-while
-       DIR="$(cd -P -- "$(dirname -- "$SCRIPT")" && pwd)"
-       test -h "$SCRIPT"
-do
-       SCRIPT="$(readlink "$SCRIPT")"
-       [ "$SCRIPT" = "${SCRIPT#/}" ] && SCRIPT="$DIR/$SCRIPT"
-done
-PATH="$DIR:/usr/local/bin:$PATH"
-export PATH
+export PATH="$PWD:/usr/local/bin:$PATH"
 
 which multimarkdown > /dev/null
 if [ $? = 1 ]

diff --git a/scripts/mmd2fodt b/scripts/mmd2fodt
index 745755bc1ef1e5e7ff09570e977335d53ebb15ec..64258d1114dd004b684461a942b022c32c80d85a 100755 (executable)
--- a/scripts/mmd2fodt
+++ b/scripts/mmd2fodt
@@ -8,17 +8,7 @@
 #
 
 # Be sure to include multimarkdown in our PATH
-unset CDPATH
-SCRIPT="$0"
-while
-       DIR="$(cd -P -- "$(dirname -- "$SCRIPT")" && pwd)"
-       test -h "$SCRIPT"
-do
-       SCRIPT="$(readlink "$SCRIPT")"
-       [ "$SCRIPT" = "${SCRIPT#/}" ] && SCRIPT="$DIR/$SCRIPT"
-done
-PATH="$DIR:/usr/local/bin:$PATH"
-export PATH
+export PATH="$PWD:/usr/local/bin:$PATH"
 
 which multimarkdown > /dev/null
 if [ $? = 1 ]

diff --git a/scripts/mmd2odt b/scripts/mmd2odt
index f8985c6770e2c18cbb39680d69fbecab7622f14c..a0acc66af770d92d7647c6674849e936a2e17933 100755 (executable)
--- a/scripts/mmd2odt
+++ b/scripts/mmd2odt
@@ -8,17 +8,7 @@
 #
 
 # Be sure to include multimarkdown in our PATH
-unset CDPATH
-SCRIPT="$0"
-while
-       DIR="$(cd -P -- "$(dirname -- "$SCRIPT")" && pwd)"
-       test -h "$SCRIPT"
-do
-       SCRIPT="$(readlink "$SCRIPT")"
-       [ "$SCRIPT" = "${SCRIPT#/}" ] && SCRIPT="$DIR/$SCRIPT"
-done
-PATH="$DIR:/usr/local/bin:$PATH"
-export PATH
+export PATH="$PWD:/usr/local/bin:$PATH"
 
 which multimarkdown > /dev/null
 if [ $? = 1 ]

diff --git a/scripts/mmd2opml b/scripts/mmd2opml
index c4b9ed648a4bd5e16689a461e735562c287b563f..7ffa149ed45c9f0a5691717438c0b4fa2d87e519 100755 (executable)
--- a/scripts/mmd2opml
+++ b/scripts/mmd2opml
@@ -8,17 +8,7 @@
 #
 
 # Be sure to include multimarkdown in our PATH
-unset CDPATH
-SCRIPT="$0"
-while
-       DIR="$(cd -P -- "$(dirname -- "$SCRIPT")" && pwd)"
-       test -h "$SCRIPT"
-do
-       SCRIPT="$(readlink "$SCRIPT")"
-       [ "$SCRIPT" = "${SCRIPT#/}" ] && SCRIPT="$DIR/$SCRIPT"
-done
-PATH="$DIR:/usr/local/bin:$PATH"
-export PATH
+export PATH="$PWD:/usr/local/bin:$PATH"
 
 which multimarkdown > /dev/null
 if [ $? = 1 ]

diff --git a/scripts/mmd2pdf b/scripts/mmd2pdf
index d8463a675564e308c075aeee1b36d6945e99fea5..1afe5a58a7f9feeb49beec37b22730dbe7287479 100755 (executable)
--- a/scripts/mmd2pdf
+++ b/scripts/mmd2pdf
@@ -15,17 +15,7 @@
 #              LaTeX file.
 
 # Be sure to include multimarkdown and latex in our PATH
-unset CDPATH
-SCRIPT="$0"
-while
-       DIR="$(cd -P -- "$(dirname -- "$SCRIPT")" && pwd)"
-       test -h "$SCRIPT"
-do
-       SCRIPT="$(readlink "$SCRIPT")"
-       [ "$SCRIPT" = "${SCRIPT#/}" ] && SCRIPT="$DIR/$SCRIPT"
-done
-PATH="$DIR:/usr/local/bin:/usr/texbin:/Library/TeX/texbin:$PATH"
-export PATH
+export PATH="$PWD:/usr/local/bin:/usr/texbin:/Library/TeX/texbin:$PATH"
 
 which multimarkdown > /dev/null
 if [ $? = 1 ]

diff --git a/scripts/mmd2tex b/scripts/mmd2tex
index 317ba75c5c940ce858f9803e8cf59bba1e197f90..2cac18d0777856bc684f7b8a01b0c521af0987bf 100755 (executable)
--- a/scripts/mmd2tex
+++ b/scripts/mmd2tex
@@ -8,17 +8,7 @@
 #
 
 # Be sure to include multimarkdown in our PATH
-unset CDPATH
-SCRIPT="$0"
-while
-       DIR="$(cd -P -- "$(dirname -- "$SCRIPT")" && pwd)"
-       test -h "$SCRIPT"
-do
-       SCRIPT="$(readlink "$SCRIPT")"
-       [ "$SCRIPT" = "${SCRIPT#/}" ] && SCRIPT="$DIR/$SCRIPT"
-done
-PATH="$DIR:/usr/local/bin:$PATH"
-export PATH
+export PATH="$PWD:/usr/local/bin:$PATH"
 
 which multimarkdown > /dev/null
 if [ $? = 1 ]