diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 12:05:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-09-28 12:05:01 +0000 |
| commit | 4971e36844b7b1faf7f97dcc4dba156101fec5a3 (patch) | |
| tree | f027f82c0cbd1b023e5ad90ff1fdbe799f6a2946 /setup_native | |
| parent | 3fe55730f9f1ef8c579852f27e2881727de434e7 (diff) | |
INTEGRATION: CWS nativefixer18 (1.12.6); FILE MERGED
2005/09/05 13:37:50 is 1.12.6.2: RESYNC: (1.12-1.13); FILE MERGED
2005/08/11 07:10:29 obr 1.12.6.1: #124959# version information moved to versionrc
Diffstat (limited to 'setup_native')
| -rw-r--r-- | setup_native/scripts/install_linux.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/setup_native/scripts/install_linux.sh b/setup_native/scripts/install_linux.sh index 8f7761792280..a37843f6e22f 100644 --- a/setup_native/scripts/install_linux.sh +++ b/setup_native/scripts/install_linux.sh @@ -88,6 +88,9 @@ fi INSTALLDIR=$2 RPM_DB_PATH=${INSTALLDIR}/.RPM_OFFICEDATABASE +# Check for versionrc +if [ -f ${INSTALLDIR}/program/versionrc ]; then VERSIONRC=versionrc; fi + if [ "$UPDATE" = "ask" ] then PRODUCT=`sed --silent -e " @@ -99,7 +102,7 @@ h s/ProductKey=// G p -}" ${INSTALLDIR}/program/bootstraprc 2>/dev/null | tr -d "\012"` +}" ${INSTALLDIR}/program/${VERSIONRC:-bootstraprc} 2>/dev/null | tr -d "\012"` if [ ! -z "$PRODUCT" ] then |