Commit d61c045c authored by Jonathan Carter's avatar Jonathan Carter
Browse files

Merge

parents 340c3917 5e44a77a
......@@ -2,7 +2,8 @@
echo "* Warning: this will install proprietary software on your computer"
echo "* This is completely unsupported by the AIMS Desktop community"
read -a ANSWER -p "* Please type 'Yes' and press Enter to continue"
read -a ANSWER -p "* Please type 'Yes' and press Enter to continue
"
if [ $ANSWER = "Yes" ]; then
apt-get -y install aims-restricted-extras
......
#!/bin/bash
echo "deb http://httpredir.debian.org/debian jessie main contrib" > /etc/apt/sources.list.d/jessie.list
# Rstudio 1.0.143 and before required 3 jessie packages to run on stretch
[ -f /etc/apt/sources.list.d/jessie.list ] && mv /etc/apt/sources.list.d/jessie.list{,.disabled}
for PKG in libgstreamer0.10-0 libgstreamer-plugins-base0.10-0 libssl1.0.0; do
dpkg -s $PKG >/dev/null 2>&1 && apt-get -y purge $PKG;
done
# New rstudio does not require jessie packages
apt-get -qq update
apt-get -y install r-recommended libgstreamer0.10-0 libgstreamer-plugins-base0.10-0 libssl1.0.0
apt-get -y install r-recommended
cd /tmp
wget -c https://download1.rstudio.org/rstudio-1.0.143-amd64.deb
dpkg -i rstudio-1.0.143-amd64.deb
wget -c https://download1.rstudio.org/rstudio-xenial-1.1.383-amd64.deb
dpkg -i rstudio-xenial-1.1.383-amd64.deb
......@@ -4,6 +4,18 @@ aims-desktop (2017.12.12) stretch; urgency=medium
-- Jonathan Carter <jonathan@aims.ac.za> Tue, 12 Dec 2017 09:06:03 +0200
aims-desktop (2017.07.04) stretch; urgency=medium
* Add newline after aims-restricted-extras prompt"
-- Jan Groenewald <jan@aims.ac.za> Fri, 04 Aug 2017 11:25:31 +0200
aims-desktop (2017.07.03) stretch; urgency=medium
* Update aims-install-rstudio
-- Jan Groenewald <jan@aims.ac.za> Mon, 31 Jul 2017 13:23:38 +0200
aims-desktop (2017.07.02) stretch; urgency=medium
* Test upload (no changes)
......
......@@ -36,7 +36,7 @@ echo " * Updating package indexes..."
apt-get -qq update
# Install software
apt-get -y install nautilus-dropbox google-talkplugin skypeforlinux pepperflashplugin-nonfree
apt-get -y install nautilus-dropbox google-talkplugin skypeforlinux #pepperflashplugin-nonfree
# Post-install configuration
# Get rid of annoying nautilus-dropbox messages
......
aims-restricted-extras (2017.10.01) stretch; urgency=medium
* Change debian non-free sources from http.debian.net to deb.debian.org
-- Jan Groenewald <jan@aims.ac.za> Mon, 09 Oct 2017 10:28:03 +0200
aims-restricted-extras (2017.09.01) stretch; urgency=medium
* Pepperflashplugin-nonfree not in stretch
-- Jan Groenewald <jan@aims.ac.za> Wed, 06 Sep 2017 16:13:45 +0200
aims-restricted-extras (2017.01.08) stretch; urgency=medium
* Fix typo in script
......
# Debian contrib and non-free
deb http://http.debian.net/debian stretch contrib non-free
deb http://deb.debian.org/debian stretch contrib non-free
deb http://http.debian.net/debian stretch-updates contrib non-free
deb http://deb.debian.org/debian stretch-updates contrib non-free
deb http://security.debian.org stretch/updates contrib non-free
Supports Markdown
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