diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2012-11-11 14:06:41 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2012-11-12 10:08:19 +0100 |
| commit | f8b5e1cb1e2a0b294b7c967a8e040e11d2da74f7 (patch) | |
| tree | b7b6dacade8dd28f3ccf527d625ec643b6154e4c | |
| parent | a71da0382ee57603f227ee6f386cc79213f7292c (diff) | |
setup_native: get install_linux.sh working again
1) Hide rpm database dir like the old Java installer GUI did, so the
user sees a single /opt directory only, like with dev-install.
2) Allow installing to an existing directory, no reason not to allow this.
3) Use --nodeps when using a custom dbpath, since in that case even
/bin/sh won't be provided by anything.
Change-Id: I70d74cc5db287668f4c926005001e05096f43a10
| -rw-r--r-- | setup_native/scripts/install_linux.sh | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/setup_native/scripts/install_linux.sh b/setup_native/scripts/install_linux.sh index c33fe989554f..917437587f61 100644 --- a/setup_native/scripts/install_linux.sh +++ b/setup_native/scripts/install_linux.sh @@ -94,6 +94,7 @@ done if [ $# != 2 ] then echo $USAGE + echo "Example: $0 . ~/libreoffice" exit 2 fi @@ -134,7 +135,7 @@ fi # INSTALLDIR=$2 -RPM_DB_PATH=${INSTALLDIR}/var/lib/rpm +RPM_DB_PATH=${INSTALLDIR}/.RPM_OFFICE_DATABASE # Check for versionrc if [ -f ${INSTALLDIR}/program/versionrc ]; then VERSIONRC=versionrc; fi @@ -206,12 +207,6 @@ then else rmdir ${INSTALLDIR} 2>/dev/null - if [ -d ${INSTALLDIR} -a "$ADD" = "no" ] - then - printf "\n$0: ${INSTALLDIR} exists and is not empty.\n" - exit 2 - fi - mkdir -p $RPM_DB_PATH || exit 2 # XXX why ? XXX chmod 700 $RPM_DB_PATH @@ -261,7 +256,7 @@ echo "Installing the RPMs" ABSROOT=`cd ${INSTALLDIR}; pwd` RELOCATIONS=`rpm -qp --qf "--relocate %{PREFIXES}=${ABSROOT}%{PREFIXES} \n" $RPMLIST | sort -u | tr -d "\012"` -UserInstallation=\$BRAND_BASE_DIR/../UserInstallation rpm ${DEBIAN_FLAGS} $RPMCMD --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST +UserInstallation=\$BRAND_BASE_DIR/../UserInstallation rpm ${DEBIAN_FLAGS} --nodeps $RPMCMD --ignoresize -vh $RELOCATIONS --dbpath $RPM_DB_PATH $RPMLIST # # Create a link into the users home directory |