Split aims-install-restricted-extras out from aims-complete-install

2017.1/aims-desktop-2017/bin/aims-complete-install

 #!/bin/bash
 
 aims-install-rstudio
-apt-get -y install aims-restricted-extras
-aims-restricted-extras-setup
 apt-get -y install sagemath-jupyter jupyter-notebook python-notebook spyder3
 aims-install-irkernel
 apt-get -y dist-upgrade

2017.1/aims-desktop-2017/bin/aims-install-restricted-extras

+#!/bin/bash
+
+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"
+
+if [ $ANSWER = "Yes" ]; then
+	apt-get -y install aims-restricted-extras
+	aims-restricted-extras-setup
+else
+	echo "Aborting..."
+fi
+

2017.1/aims-desktop-2017/debian/changelog

+aims-desktop (2017.05.01) stretch; urgency=medium
+
+  * split aims-install-restricted-extras out from aims-complete-install
+
+ -- Jan Groenewald <jan@aims.ac.za>  Wed, 03 May 2017 13:16:22 +0200
+
 aims-desktop (2017.04.03) stretch; urgency=medium
 
   * Explicitly add sudo

2017.1/aims-desktop-2017/debian/install

@@ -3,6 +3,7 @@ aims-starburst.png usr/share/pixmaps
 bin/aims-collect-support-data usr/bin
 bin/aims-complete-install usr/sbin
 bin/aims-install-irkernel usr/sbin
+bin/aims-install-restricted-extras usr/sbin
 bin/aims-install-rstudio usr/sbin
 conf/gsettings/10_com.gexperts.Terminix.gschema.override usr/share/glib-2.0/schemas
 conf/gsettings/95_aims-desktop.gschema.override  usr/share/glib-2.0/schemas

2017.1/readme-alpha-beta-installs.txt

@@ -51,3 +51,5 @@ morris
 lesiba (2x laptops)
 smegnsh (rtl8188ee wireless not working REVERTED TO UBUNTU 14.04)
 
+# rc2
+alicenanyanzi