Commit 5c4dc457 authored by Jonathan Carter's avatar Jonathan Carter
Browse files

Add back EOF after it was inadvertently removed

parents 7131f5dc 969c6ac7
......@@ -6,7 +6,7 @@ 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
RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.2.1335-amd64.deb
RSTUDIO=https://download1.rstudio.org/desktop/debian9/x86_64/rstudio-1.2.5033-amd64.deb
# New rstudio does not require jessie packages
gpg --keyserver keys.gnupg.net --recv-keys 3F32EE77E331692F
......@@ -14,5 +14,5 @@ apt-get -qq update
apt-get -y install r-recommended libjpeg62 libedit2 libssl1.0.2 libgstreamer1.0-0 libgstreamer-plugins-base1.0-0 libobjc-6-dev libclang1-3.8 libobjc4 libllvm3.8 libclang-3.8-dev libclang-dev libclang-common-3.8-dev
cd /tmp
wget -c $RSTUDIO
dpkg-sig --verify ${RSTUDIO#https://download1.rstudio.org/desktop/bionic/amd64/} && \
dpkg -i ${RSTUDIO#https://download1.rstudio.org/desktop/bionic/amd64/}
dpkg-sig --verify ${RSTUDIO#https://download1.rstudio.org/desktop/debian9/amd64/} && \
dpkg -i ${RSTUDIO#https://download1.rstudio.org/desktop/debian9/amd64/}
aims-desktop (3:2019.11.02) stretch; urgency=medium
* Update rstudi oto 1.2.5033
-- Jan Groenewald <jan@aims.ac.za> Tue, 31 Dec 2019 09:27:46 +0000
aims-desktop (3:2019.11.01) stretch; urgency=medium
* Update rstudio to 1.2.5019
-- Jan Groenewald <jan@aims.ac.za> Wed, 06 Nov 2019 13:16:32 +0000
aims-desktop (3:2019.07.20) stretch; urgency=medium
* Update rstudio version
-- Jan Groenewald <jan@aims.ac.za> Fri, 20 Sep 2019 07:44:20 +0000
aims-desktop (3:2019.07.19) stretch; urgency=medium
* Bump Epoch
......
......@@ -9,3 +9,4 @@ set timeout_style=menu
terminal_output gfxterm
background_image /boot/grub/themes/aims-desktop/background.png
EOF
......@@ -8,15 +8,21 @@ if [ "$1" != "-f" ];then
exit 1
fi
# Make sure locales are generated
locale-gen
# Stop background updates
systemctl stop apt-daily
systemctl stop apt-daily-upgrade
systemctl stop unattended-upgrades
# install software
aims-install-rstudio
apt-get -y install sagemath-jupyter jupyter jupyter-notebook python-notebook spyder3 r-cran-irkernel
apt-get -y dist-upgrade
apt-get clean
# clear Mac OSX boot entries in grub (installer USB looks like a Mac disk and get's added to grub)
update-grub
# Start backround updates again
systemctl start apt-daily
systemctl start apt-daily-upgrade
systemctl start unattended-upgrades
......
#!/bin/bash
apt-get --no-install-recommends -y install build-essential jupyter-notebook r-recommended libssl-dev libcurl4-openssl-dev libssh2-1-dev
Rscript -e "install.packages(c('repr','IRdisplay','crayon','pbdZMQ','devtools'), repos='https://cran.r-project.org', lib='/usr/local/lib/R/site-library/')"
Rscript -e "devtools::install_github('IRkernel/IRkernel', lib='/usr/local/lib/R/site-library')"
Rscript -e "IRkernel::installspec(user=FALSE)"
#!/bin/bash
#RSTUDIO=https://download1.rstudio.org/desktop/debian9/x86_64/rstudio-1.2.1335-amd64.deb
RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.2.1335-amd64.deb
RSTUDIO=https://download1.rstudio.org/desktop/bionic/amd64/rstudio-1.3.959-amd64.deb
gpg --keyserver keys.gnupg.net --recv-keys 3F32EE77E331692F
apt-get -qq update
......
......@@ -17,7 +17,11 @@ echo "RTL8723DE wifi card has been detected, proceeding with installation..."
sleep 2
cd /usr/src
<<<<<<< HEAD
git clone https://github.com/smlinux/rtl8723de.git -b $REVISION
=======
git clone https://github.com/smlinux/rtl8723de.git -b 4.15-up
>>>>>>> 969c6ac74e1e6620e6eeef535d528501ba1eec08
dkms add ./rtl8723de
dkms install rtl8723de/5.1.1.8_21285.20171026_COEX20170111-1414
depmod -a
......
#!/bin/bash
rm -f /tmp/zoom_amd64.deb
wget -O /tmp/zoom_amd64.deb https://zoom.us/client/latest/zoom_amd64.deb
dpkg -i /tmp/zoom_amd64.deb
apt-get -yf install
<<<<<<< HEAD
aims-desktop (1:2020.64) buster; urgency=medium
* Update rtl installer script
-- Jonathan Carter <jonathan@aims.ac.za> Tue, 10 Sep 2019 10:49:41 +0000
=======
aims-desktop (1:2020.73) buster; urgency=medium
* Update rstudio to 1.3.959
-- Jan Groenewald <jan@aims.ac.za> Wed, 27 May 2020 04:34:45 +0000
aims-desktop (1:2020.72) buster; urgency=medium
* Update aims-install-rstudio to 1.2.5042
-- Jan Groenewald <jan@aims.ac.za> Thu, 30 Apr 2020 20:24:18 +0000
aims-desktop (1:2020.71) buster; urgency=medium
* Add aims-install-zoom
-- Jan Groenewald <jan@aims.ac.za> Fri, 03 Apr 2020 12:16:03 +0000
aims-desktop (1:2020.70) buster; urgency=medium
* Update 4.15-up branch for aims-install-rtl8723de
-- Jan Groenewald <jan@aims.ac.za> Thu, 16 Jan 2020 12:06:14 +0000
aims-desktop (1:2020.69) buster; urgency=medium
* Update to Rstudio 1.2.5033
-- Jan Groenewald <jan@aims.ac.za> Tue, 31 Dec 2019 09:25:32 +0000
aims-desktop (1:2020.68) buster; urgency=medium
* Update to Rstudio 1.2.5019
-- Jan Groenewald <jan@aims.ac.za> Wed, 06 Nov 2019 13:05:34 +0000
aims-desktop (1:2020.67) buster; urgency=medium
* Update rstudio version
-- Jan Groenewald <jan@aims.ac.za> Fri, 20 Sep 2019 07:46:29 +0000
aims-desktop (1:2020.66) buster; urgency=medium
* Add locale-gen to aims-complete-install
-- Jan Groenewald <jan@aims.ac.za> Thu, 12 Sep 2019 11:30:11 +0000
aims-desktop (1:2020.65) buster; urgency=medium
* Update d/install file
-- Jan Groenewald <jan@aims.ac.za> Wed, 11 Sep 2019 07:42:21 +0000
aims-desktop (1:2020.64) buster; urgency=medium
* Add aims-install-irkernel for buster for comiling against newer R
-- Jan Groenewald <jan@aims.ac.za> Wed, 11 Sep 2019 06:42:14 +0000
>>>>>>> 969c6ac74e1e6620e6eeef535d528501ba1eec08
aims-desktop (1:2020.63) unstable; urgency=medium
......
......@@ -3,11 +3,13 @@ aims-collect-support-data.png usr/share/pixmaps
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-latest-firefox usr/sbin
bin/aims-install-macaulay2 usr/sbin
bin/aims-install-restricted-extras usr/sbin
bin/aims-install-rstudio usr/sbin
bin/aims-install-rtl8723de usr/sbin
bin/aims-install-zoom 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
conf/gsettings/95_dashtodock.gschema.override usr/share/glib-2.0/schemas
......
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