Commit a268365e authored by Gustav Geier's avatar Gustav Geier

Fixed typo and added portability across Ubuntu versions

parent 1e41272b
......@@ -34,7 +34,7 @@ COMMON_PKGS=(\
"TRUE" "git" "Versionsverwaltungstool (dezentral)" \
"TRUE" "graphviz" "Tool zum visualisieren von Graphen" \
"TRUE" "liblapacke-dev" "LAPACK ist eine Standard-Numerik-Bibliothek für Physiker und Numeriker" \
"TRUE" "liplapack-doc" "LAPACK Dokumentation (s. oben)" \
"TRUE" "liblapack-doc" "LAPACK Dokumentation (s. oben)" \
"FALSE" "gnome" "GNOME3 Desktop Umgebung" \
"FALSE" "xubuntu-desktop" "Xubuntu Desktop Umgebung und standard Programme" \
"FALSE" "fityk" "Tool zum Daten-Fitting und Analyse" \
......@@ -165,7 +165,7 @@ case "$GUI" in
#ACHTUNG: nicht vorausgewählte Packete werden _nie_ installiert!
local arg=$3[@]
pkglist=$(preinstalledpkgs $3)
if [ -n "$pkglist" ]; then
INSTALLED_PKGS="$INSTALLED_PKGS $4" #register pseudo package
apt-install $pkglist
......@@ -231,7 +231,6 @@ case "$GUI" in
}
install_pkgs() {
local pkglist=$3[@]
declare -a kdlist
......@@ -266,11 +265,12 @@ case "$GUI" in
;;
esac
done
INSTALL=$(kdialog --geometry 786x400 --title "$1" --checklist "$2" "${kdlist[@]}" 2> /dev/null || true)
if [ -n "$INSTALL" ]; then
INSTALLED_PKGS="$INSTALLED_PKGS $4" #register pseudo package
apt-install $INSTALL
apt-install $(echo $INSTALL | tr -d \")
ok "$INSTALL installiert"
else
ok "Keine Packete installiert"
......@@ -354,15 +354,13 @@ install_anaconda() {
err "Der Anaconda-Installer hat versagt... ."
return 1
fi
echo "Registriere Anaconda in \$PATH"
pushd /
patch -p1 < "$HIVE_DIR/anaconda/envpatch.patch"
popd
INSTALLED_PKGS="$INSTALLED_PKGS anaconda"
ok "Anaconda wurde anscheinend erfolgreich installiert!"
fi
}
......@@ -396,7 +394,7 @@ create_doc()
err "Fehler beim kompilieren der Dokumentation."
return 1
fi
cp "${WORKING_DIR}/$(basename -s .tex ${DOCFILE}).pdf" "$HOME/Deine-LIP-Dokumentation.pdf"
return $?
......
......@@ -3,11 +3,14 @@
ACTION="$1"
FILENAME="/etc/apt/sources.list.d/lipoffline.list"
ACTIVATED=`test -e "$FILENAME"`
DIST_CODENAME="saucy"
DIST_VERSION="13.10"
function install_repo()
{
echo "# offline repository of the linux install party
deb [ trusted=yes ] file://$1/archives precise lip" > "$FILENAME"
deb [ trusted=yes ] file://$1/archives $DIST_CODENAME lip" > "$FILENAME"
}
function uninstall_repo()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment