瀏覽代碼

when checking to see if functions.sh exists, use the full path.

Fixes issue 3888.
Probably makes issue 3887 redundant, but I'll do it anyway.

Change-Id: If196ea5f2dc74334058ee9b876f43bcef0414d9e
Reviewed-on: http://gerrit.dmdirc.com/1019
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>
tags/0.6.4rc1
Shane Mc Cormack 14 年之前
父節點
當前提交
989109b03c
共有 5 個檔案被更改,包括 7 行新增7 行删除
  1. 1
    1
      installer/linux/getjre.sh
  2. 1
    1
      installer/linux/installjre.sh
  3. 1
    1
      installer/linux/setup.sh
  4. 1
    1
      installer/linux/uninstall.sh
  5. 3
    3
      launcher/unix/DMDirc.sh

+ 1
- 1
installer/linux/getjre.sh 查看文件

@@ -47,7 +47,7 @@ if [ "${PIDOF}" = "" ]; then
47 47
 	fi;
48 48
 fi;
49 49
 
50
-if [ -e "functions.sh" ]; then
50
+if [ -e "${BASEDIR}/functions.sh" ]; then
51 51
 	. ${BASEDIR}/functions.sh
52 52
 else
53 53
 	echo "Unable to find functions.sh, unable to continue."

+ 1
- 1
installer/linux/installjre.sh 查看文件

@@ -64,7 +64,7 @@ fi;
64 64
 
65 65
 ISFREEBSD=`uname -s | grep -i FreeBSD`
66 66
 
67
-if [ -e "functions.sh" ]; then
67
+if [ -e "${BASEDIR}/functions.sh" ]; then
68 68
 	. ${BASEDIR}/functions.sh
69 69
 else
70 70
 	echo "Unable to find functions.sh, unable to continue."

+ 1
- 1
installer/linux/setup.sh 查看文件

@@ -67,7 +67,7 @@ if [ "${PIDOF}" = "" ]; then
67 67
 	fi;
68 68
 fi;
69 69
 
70
-if [ -e "functions.sh" ]; then
70
+if [ -e "${BASEDIR}/functions.sh" ]; then
71 71
 	. ${BASEDIR}/functions.sh
72 72
 else
73 73
 	echo "Unable to find functions.sh, unable to continue."

+ 1
- 1
installer/linux/uninstall.sh 查看文件

@@ -61,7 +61,7 @@ fi;
61 61
 
62 62
 JAVA=`which java`
63 63
 
64
-if [ -e "functions.sh" ]; then
64
+if [ -e "${BASEDIR}/functions.sh" ]; then
65 65
 	. ${BASEDIR}/functions.sh
66 66
 else
67 67
 	echo "Unable to find functions.sh, unable to continue."

+ 3
- 3
launcher/unix/DMDirc.sh 查看文件

@@ -23,7 +23,7 @@
23 23
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
24 24
 # SOFTWARE.
25 25
 
26
-LAUNCHERVERSION="15"
26
+LAUNCHERVERSION="16"
27 27
 LAUNCHERINFO="unix-${LAUNCHERVERSION}"
28 28
 
29 29
 params=""
@@ -79,7 +79,7 @@ for param in "$@"; do
79 79
 	fi;
80 80
 done;
81 81
 
82
-if [ -e "functions.sh" ]; then
82
+if [ -e "${BASEDIR}/functions.sh" ]; then
83 83
 	. ${BASEDIR}/functions.sh
84 84
 else
85 85
 	echo "Unable to find functions.sh, using built in functions"
@@ -204,7 +204,7 @@ elif [ -e "${profiledir}/.launcher.sh" ]; then
204 204
 	# break!
205 205
 	cat <<EOF> ${launcherUpdater}
206 206
 		cd ${BASEDIR}
207
-		if [ -e "functions.sh" ]; then
207
+		if [ -e "${BASEDIR}/functions.sh" ]; then
208 208
 			. ${BASEDIR}/functions.sh
209 209
 		else
210 210
 			echo "Unable to find functions.sh, using old functions"

Loading…
取消
儲存