summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Schlüter <bschlueter@posteo.de>2018-01-24 14:49:14 +0100
committerBenjamin Schlüter <bschlueter@posteo.de>2018-01-24 14:49:14 +0100
commite07bad4b97beee5cffceb9c00edd5e1f94be3dbb (patch)
treebf2230a60cca8f41da30deaa68dfbebd5eabf707
parent834af3a6e594a45f9df5b615297b6dfa1373c1c5 (diff)
downloaditzks-install-script-e07bad4b97beee5cffceb9c00edd5e1f94be3dbb.tar.gz
itzks-install-script-e07bad4b97beee5cffceb9c00edd5e1f94be3dbb.tar.bz2
itzks-install-script-e07bad4b97beee5cffceb9c00edd5e1f94be3dbb.zip
itzks-installscript: Simplify and merge scripts for itzks.list and repos.
-rw-r--r--install-itzks-workstation16
1 files changed, 2 insertions, 14 deletions
diff --git a/install-itzks-workstation b/install-itzks-workstation
index 16ce25d..bd5f48d 100644
--- a/install-itzks-workstation
+++ b/install-itzks-workstation
@@ -14,7 +14,6 @@ if [ -z $(getent passwd locadm) ];
adduser locadm sudo
fi
-
# Enlarge root-fs
if [ -e /dev/vg_system/usr ]; then
@@ -28,26 +27,15 @@ fi
# Retrieve LDAP CA certificate
invoke-rc.d fetch-ldap-cert start
-# Alternate add itzks-package repo only if not already there
+# Add itzks.list and its contents if file not already there
if [ ! -e /etc/apt/sources.list.d/itzks.list ]
then
touch /etc/apt/sources.list.d/itzks.list
-fi
-
-# Add repos to itzks.list if empty
-if [ ! -s /etc/apt/sources.list.d/itzks.list ]
- then
- echo "deb http://packages.it-zukunt-schule.de/debian stretch main contrib non-free" >> /etc/apt/sources.list.d/itzks.list
+ echo "deb http://packages.it-zukunt-schule.de/debian stretch main contrib non-free" > /etc/apt/sources.list.d/itzks.list
echo "deb http://packages.it-zukunft-schule.de/debian stretch-backports main contrib non-free" >> /etc/apt/sources.list.d/itzks.list
echo "deb http://packages.it-zukunft-schuke.de/debian sid main contrib non-free" >> /etc/apt/sources.list.d/itzks.list
fi
-# Add itzks-package repo
-# touch /etc/apt/sources.list.d/itzks.list
-# echo "deb http://packages.it-zukunft-schule.de/debian stretch main contrib non-free" >> /etc/apt/sources.list.d/itzks.list
-# echo "deb http://packages.it-zukunft-schule.de/debian stretch-backports main contrib non-free" >> /etc/apt/sources.list.d/itzks.list
-# echo "deb http://packages.it-zukunft-schule.de/debian sid main contrib non-free" >> /etc/apt/sources.list.d/itzks.list
-
# Export proxy-settings for first install
export http_proxy=http://webcache:3128
export https_proxy=http://webcache:3128