diff --git a/hive/anaconda/anaconda_wrapper.sh b/hive/anaconda/anaconda_wrapper.sh new file mode 100644 index 0000000000000000000000000000000000000000..eb7c9655666e58760c25f7380a1d901d0a035282 --- /dev/null +++ b/hive/anaconda/anaconda_wrapper.sh @@ -0,0 +1,4 @@ +#!/bin/bash +unset QT_PLUGIN_PATH +exec /opt/anaconda/bin/$(basename $0) $@ + diff --git a/hive/anaconda/envpatch.patch b/hive/anaconda/envpatch.patch index f4a3d5bd4f9e580364b90ad363304fa5fc207d60..6a9500a772d4c087372a91eb95539feeedccc43b 100644 --- a/hive/anaconda/envpatch.patch +++ b/hive/anaconda/envpatch.patch @@ -2,5 +2,5 @@ +++ b/etc/environment 2014-03-16 19:50:45.768643532 +0000 @@ -1,2 +1,2 @@ -PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" -+PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/anaconda/bin" ++PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/anaconda/lipbin" RUNNING_UNDER_GDM="yes" diff --git a/hive/anaconda/qt.conf b/hive/anaconda/qt.conf new file mode 100644 index 0000000000000000000000000000000000000000..45c6297bff87087a8b651c2c54fcfc41e332b097 --- /dev/null +++ b/hive/anaconda/qt.conf @@ -0,0 +1,2 @@ +[Paths] +Plugins = '.' diff --git a/scripts/linuxparty.sh b/scripts/linuxparty.sh index 0d8fd9eb62a457fe9c03703fd76845f8e2d82e3b..2dc1dc5c246edea4b3eb727fd946a865bc54b066 100644 --- a/scripts/linuxparty.sh +++ b/scripts/linuxparty.sh @@ -323,6 +323,7 @@ install_anaconda() { then err "Hive konnte nicht gefunden werden ( kein LIP-Stick? ). Ohne Hive kann Anaconda leider nicht installiert werden!" else + ANACONDA_DIR=/opt/anaconda ARCH="$(uname -m)" INSTALLER="$HIVE_DIR"/anaconda/Installer- if [ "$ARCH" == "x86_64" ]; then @@ -333,10 +334,10 @@ install_anaconda() { INSTALLER="${INSTALLER}.sh" echo "Benutze Anaconda-Installer: $INSTALLER ." - if [ -d "/opt/anaconda/" ]; then + if [ -d "$ANACONDA_DIR" ]; then if askyesno "Anaconda ist anscheinend schon installiert. Neuinstallieren?"; then echo "Entferne alte Installation..." - rm -R /opt/anaconda/ + rm -R "$ANACONDA_DIR" echo "ok" else echo "Installation von Anaconda wird abgebrochen..." @@ -349,16 +350,26 @@ install_anaconda() { return 0 fi - $INSTALLER -b -p /opt/anaconda/ + $INSTALLER -b -p "$ANACONDA_DIR" if [ $? -ne 0 ]; then err "Der Anaconda-Installer hat versagt... ." return 1 fi + echo "Installiere Qt-Version-Fix-Wrapper" + mkdir -p "$ANACONDA_DIR"/lipbin + cp "$HIVE_DIR"/anaconda/anaconda_wrapper.sh "$ANACONDA_DIR"/lipbin + cp "$HIVE_DIR"/anaconda/qt.conf "$ANACONDA_DIR"/bin + + pushd "$ANACONDA_DIR"/bin > /dev/null + find -type f -executable -exec ln -s $ANACONDA_DIR/lipbin/anaconda_wrapper.sh $ANACONDA_DIR/lipbin/{} \; + popd > /dev/null + echo "Registriere Anaconda in \$PATH" - pushd / + pushd / > /dev/null patch -p1 < "$HIVE_DIR/anaconda/envpatch.patch" - popd + popd > /dev/null + INSTALLED_PKGS="$INSTALLED_PKGS anaconda" ok "Anaconda wurde anscheinend erfolgreich installiert!" fi @@ -396,8 +407,10 @@ create_doc() fi cp "${WORKING_DIR}/$(basename -s .tex ${DOCFILE}).pdf" "$HOME/Deine-LIP-Dokumentation.pdf" + RC=$? + pressenter "Dokummentation der von dir installierten Paktete wurde in deinem Benutzerverzeichnis ($HOME) als 'Deine-LIP-Dokumentation.pdf' abegelegt." - return $? + return $RC } echo "Entferne Ubuntu Installer (bleibt manchmal über...)"