| author | Petr Nyc <Petr.Nyc@Oracle.COM> |
| Thu, 11 Jun 2015 06:36:56 -0700 | |
| branch | s11u2-sru |
| changeset 4466 | a276a7815539 |
| parent 2507 | bdc001f3484f |
| child 4601 | 63c842b82978 |
| permissions | -rw-r--r-- |
|
2507
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
1 |
# This patch fixes a problem in which sometimes areca wouldn't |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
2 |
# start, depending on your current working directory, due to |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
3 |
# faulty setting of PROGRAM_DIR. |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
4 |
# When updating to the new areca v5.2.16, this patch should |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
5 |
# no longer be needed. |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
6 |
diff -rupN areca-7.1-orig/areca.sh areca-7.1/areca.sh |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
7 |
--- areca-7.1-orig/areca.sh 2009-04-20 01:44:14.000000000 -0700 |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
8 |
+++ areca-7.1/areca.sh 2012-11-19 16:13:05.288917000 -0800 |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
9 |
@@ -7,14 +7,7 @@ |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
10 |
#Options |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
11 |
JAVADIR=/usr/java |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
12 |
|
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
13 |
-#Getting Areca's directory |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
14 |
-PROGRAM_DIR=`dirname "$0"` |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
15 |
-#Solaris path |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
16 |
-if [ -f ../../usr/bin/areca ]; then |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
17 |
- PROGRAM_DIR=../../usr/share/areca |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
18 |
-fi |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
19 |
- |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
20 |
-PROGRAM_DIR=`cd "$PROGRAM_DIR"; pwd` |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
21 |
+PROGRAM_DIR=/usr/share/areca |
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
22 |
cd "${PROGRAM_DIR}"
|
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
23 |
|
|
bdc001f3484f
15919018 areca won't start; missing library/java/swt dependency
April Chin <april.chin@oracle.com>
parents:
diff
changeset
|
24 |
#Configured directories |