瀏覽代碼

Fix including functions.sh when using dash not bash.

Change-Id: I4a841edd8f6ad169fdac6e99960ce71e09e6469c
Reviewed-on: http://gerrit.dmdirc.com/51
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
tags/0.6.3m2^0
Shane Mc Cormack 14 年之前
父節點
當前提交
b6e5f48a08
共有 5 個文件被更改,包括 6 次插入6 次删除
  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. 2
    2
      launcher/unix/DMDirc.sh

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

37
 fi;
37
 fi;
38
 
38
 
39
 if [ -e "functions.sh" ]; then
39
 if [ -e "functions.sh" ]; then
40
-	. functions.sh
40
+	. `dirname $0`/functions.sh
41
 else
41
 else
42
 	echo "Unable to find functions.sh, unable to continue."
42
 	echo "Unable to find functions.sh, unable to continue."
43
 	exit 1;
43
 	exit 1;

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

54
 ISFREEBSD=`uname -s | grep -i FreeBSD`
54
 ISFREEBSD=`uname -s | grep -i FreeBSD`
55
 
55
 
56
 if [ -e "functions.sh" ]; then
56
 if [ -e "functions.sh" ]; then
57
-	. functions.sh
57
+	. `dirname $0`/functions.sh
58
 else
58
 else
59
 	echo "Unable to find functions.sh, unable to continue."
59
 	echo "Unable to find functions.sh, unable to continue."
60
 	exit 1;
60
 	exit 1;

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

57
 fi;
57
 fi;
58
 
58
 
59
 if [ -e "functions.sh" ]; then
59
 if [ -e "functions.sh" ]; then
60
-	. functions.sh
60
+	. `dirname $0`/functions.sh
61
 else
61
 else
62
 	echo "Unable to find functions.sh, unable to continue."
62
 	echo "Unable to find functions.sh, unable to continue."
63
 	exit 1;
63
 	exit 1;

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

23
 JAVA=`which java`
23
 JAVA=`which java`
24
 
24
 
25
 if [ -e "functions.sh" ]; then
25
 if [ -e "functions.sh" ]; then
26
-	. functions.sh
26
+	. `dirname $0`/functions.sh
27
 else
27
 else
28
 	echo "Unable to find functions.sh, unable to continue."
28
 	echo "Unable to find functions.sh, unable to continue."
29
 	exit 1;
29
 	exit 1;

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

69
 done;
69
 done;
70
 
70
 
71
 if [ -e "functions.sh" ]; then
71
 if [ -e "functions.sh" ]; then
72
-	. functions.sh
72
+	. `dirname $0`/functions.sh
73
 else
73
 else
74
 	# TODO: Remove this and depend on functions.sh...
74
 	# TODO: Remove this and depend on functions.sh...
75
 	echo "Unable to find functions.sh, using old functions"
75
 	echo "Unable to find functions.sh, using old functions"
264
 	cat <<EOF> ${launcherUpdater}
264
 	cat <<EOF> ${launcherUpdater}
265
 		cd `dirname $0`
265
 		cd `dirname $0`
266
 		if [ -e "functions.sh" ]; then
266
 		if [ -e "functions.sh" ]; then
267
-			. functions.sh
267
+			. `dirname $0`/functions.sh
268
 		else
268
 		else
269
 			# TODO: Remove this and depend on functions.sh...
269
 			# TODO: Remove this and depend on functions.sh...
270
 			echo "Unable to find functions.sh, using old functions"
270
 			echo "Unable to find functions.sh, using old functions"

Loading…
取消
儲存