Mercurial Mercurial > upstream > oracle > spec-files / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patches/songbird-04-startup-script.diff
author rohinis
Tue, 29 Nov 2011 17:32:55 +0000
branchs11express-2010-11
changeset 22234 c23e64da3e06
parent 18110 93461edb1490
permissions -rw-r--r--
2011-11-29 Rohini S <[email protected]> * patches/Python26-22-audio.diff: Fixes CVE-2010-1634 * specs/SUNWPython26.spec: Fixes CR 7085446
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
18110
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     1
 
--- Songbird1.0.0/installer/linux/songbird.sh.orig	2009-01-07 18:33:02.528779259 +0800
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     2
 
+++ Songbird1.0.0/installer/linux/songbird.sh	2009-01-07 18:35:32.162491459 +0800
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     3
 
@@ -44,6 +44,7 @@
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     4
 
 MOZ_APPRUNNER_NAME="./mozilla-bin"
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     5
 
 MOZ_VIEWER_NAME="./viewer"
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     6
 
 MOZ_PROGRAM=""
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     7
 
+MOZ_LIBDIR=/usr/lib/songbird
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     8
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
     9
 
 exitcode=0
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    10
 
 #
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    11
 
@@ -304,6 +305,9 @@
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    12
 
 	if [ -x "$MOZ_DIST_BIN/$MOZ_DEFAULT_NAME" ]
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    13
 
 	then
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    14
 
 		MOZ_PROGRAM=$MOZ_DIST_BIN/$MOZ_DEFAULT_NAME
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    15
 
+	elif [ -x "$MOZ_LIBDIR/$MOZ_DEFAULT_NAME" ]
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    16
 
+	then
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    17
 
+		MOZ_PROGRAM=$MOZ_LIBDIR/$MOZ_DEFAULT_NAME
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    18
 
 	##
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    19
 
 	## Try mozilla-bin
93461edb1490 2010-06-10 Christian Kelly <[email protected]>
chrisk
parents:
diff changeset 
    20
 
 	##
upstream/oracle/spec-files