Merge pull request #1726 from vladak/script_pwd

tarzanek · web-flow · commit 71519bbb24fb · 2017-08-08T18:06:17.000+02:00
do not rely on readlink
diff --git a/OpenGrok b/OpenGrok
@@ -134,8 +134,8 @@ else
 	exit 1
 fi
 
-SCRIPT_FILE=`readlink -f "${0}"`
-SCRIPT_DIRECTORY=`dirname "${SCRIPT_FILE}"`
+SCRIPT_DIRECTORY=`dirname "${0}"`
+export SCRIPT_DIRECTORY=`cd "${SCRIPT_DIRECTORY}"; pwd -P`
 
 #
 # Default Instance Configuration

Original file line number	Diff line number	Diff line change
`@@ -134,8 +134,8 @@ else`
`134`	`134`	`exit 1`
`135`	`135`	`fi`
`136`	`136`
`137`		-SCRIPT_FILE=`readlink -f "${0}"`
`138`		-SCRIPT_DIRECTORY=`dirname "${SCRIPT_FILE}"`
	`137`	+SCRIPT_DIRECTORY=`dirname "${0}"`
	`138`	+export SCRIPT_DIRECTORY=`cd "${SCRIPT_DIRECTORY}"; pwd -P`
`139`	`139`
`140`	`140`	`#`
`141`	`141`	`# Default Instance Configuration`