Commit recent changes

2017.1/aims-live-2017/calamares/settings.conf

@@ -52,6 +52,7 @@ sequence:
   - packages
   - luksbootkeyfile
   - luksopenswaphookcfg
+  - plymouthcfg
   - initramfscfg
   - initramfs
   - grubcfg

2017.1/aims-live-2017/debian/aims-live/DEBIAN/control

 Package: aims-live
-Version: 2017.2.20180912.1
+Version: 2017.2.20180924.1
 Architecture: all
 Maintainer: Jonathan Carter <jcarter@linux.com>
-Installed-Size: 215
+Installed-Size: 216
 Depends: calamares, hashcheck, live-boot, live-boot-initramfs-tools, live-config, live-config-systemd, live-tools, qml-module-qtquick-window2, qml-module-qtquick2, user-setup, xserver-xorg-legacy, md5sumchecker, dconf-gsettings-backend | gsettings-backend
 Conflicts: antiword, catdoc, cups-browsed, cython-doc, docbook-dsssl, docutils-doc, ecl-doc, fckeditor, fflas-ffpack-dev-doc, fflas-ffpack-user-doc, gmp-doc, httpd-cgi, libgmp10-doc, libmpfi-doc, libmpfr-dev, mercurial, nauty-doc, pari-galpol, pari-gp2c, python-4suite-xml, python-attr-doc, python-cairocffi, python-configobj, python-cycler-doc, python-cysignals-doc, python-flask-autoindex-doc, python-flask-babel-doc, python-flask-doc, python-flask-openid-doc, python-flask-silk-doc, python-flup, python-fpylll-doc, python-gd-dbg, python-gdchart, python-genshi, python-glade2, python-greenlet, python-ldap, python-manuel, python-matplotlib-doc, python-memcache, python-mpmath-doc, python-mysqldb, python-networkx-doc, python-nose, python-pam, python-ply-doc, python-pydot, python-pylibmc, python-pyparsing-doc, python-pyxmpp, python-qt3, python-qt4, python-redis, python-rpy-docs, python-scipy-doc, python-serial, python-sip, python-sphinx-rtd-theme, python-stemmer, python-traits, python-twisted-bin-dbg, python-werkzeug-doc, python-wxgtk3.0, python-xml, python-zope.testing, sagetex-doc, singular-dev-doc, slime, sphinx-doc, sqlite3-doc, symmetrica-doc, tachyon-doc, texlive-fonts-extra-doc, texlive-latex-base-doc, texlive-latex-extra-doc, texlive-latex-recommended-doc, texlive-pictures-doc, texlive-pstricks-doc, texlive-publishers-doc, texlive-science-doc
 Section: gnome

2017.1/aims-live-2017/debian/aims-live/DEBIAN/md5sums

@@ -10,8 +10,8 @@ c72e4cd93838046cb1993a0e7348f5a6  usr/sbin/enable-locales
 728094981cb53e8d086908db21e355a9  usr/sbin/sources-final
 c253e89eb9a34ef1431515a63f7b4ea7  usr/sbin/sources-installtime
 ab3179cb9bcb22bc1dd60dfdbabbf3de  usr/sbin/unmount-media-chroot
-eaf5f40b42643ee7fb20999b24922210  usr/share/applications/install-aims-desktop.desktop
-ce73ee5f8fce1fd5e33ea6e4381bcb25  usr/share/doc/aims-live/changelog.gz
+5714184e5b32e56637813b80281ca43f  usr/share/applications/install-aims-desktop.desktop
+b13eac9646ee57ee33272160bf44d3f4  usr/share/doc/aims-live/changelog.gz
 0b17a4e5a2b1a6b3e11493fbe4213fbf  usr/share/doc/aims-live/copyright
 0768e481533b432cb00be1223d8d6e35  usr/share/glib-2.0/schemas/96_aims-desktop-live.gschema.override
-1b1b308ccae91dcb2d2790f2cd6cf4ef  usr/share/pixmaps/install-aims-desktop.png
+1343c39ada8ebf42d66471e044d4728c  usr/share/pixmaps/install-aims-desktop.png

2017.1/aims-live-2017/debian/aims-live/DEBIAN/postrm

@@ -11,9 +11,15 @@ chmod +s /bin/ping
 chmod 0755 /
 
 # Add splash for grub, if you dont want it, add 'nosplash'
-if [ $(grep GRUB_CMDLINE_LINUX_DEFAULT /etc/default/grub) = \
-    'GRUB_CMDLINE_LINUX_DEFAULT="quiet"' ]; then
-    sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"/g' /etc/default/grub
-fi
+sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"/' /etc/default/grub
+update-grub
+
+case "$1" in
+    remove)
+        # Restore original Calamares icon
+        dpkg-divert --quiet --rename --package aims-live \
+                   --remove /usr/share/applications/calamares.desktop
+    ;;
+esac
 
 exit 0

2017.1/aims-live-2017/debian/aims-live/etc/calamares/settings.conf

@@ -52,6 +52,7 @@ sequence:
   - packages
   - luksbootkeyfile
   - luksopenswaphookcfg
+  - plymouthcfg
   - initramfscfg
   - initramfs
   - grubcfg

2017.1/aims-live-2017/debian/aims-live/usr/share/applications/install-aims-desktop.desktop

@@ -8,3 +8,4 @@ Comment=Calamares — AIMS Desktop Installer
 Icon=install-aims-desktop
 Terminal=false
 Categories=Qt;
+StartupWMClass=calamares

2017.1/aims-live-2017/debian/changelog

+aims-live (2017.2.20180924.1) stretch; urgency=medium
+
+  * Add plymouthcfg to calamares/settings
+
+ -- Jonathan Carter <jcc@debian.org>  Tue, 25 Sep 2018 12:36:22 +0200
+
+aims-live (2017.2.20180919.2) stretch; urgency=medium
+
+  * Add StartupWMClass to install-aims-desktop to avoid duplicate
+    calamares panel entry 
+
+ -- Jonathan Carter <jcc@debian.org>  Wed, 19 Sep 2018 13:50:06 +0200
+
 aims-live (2017.2.20180919.1) stretch; urgency=medium
 
   * Add divert to remove default calamares desktop entry from live session 

2017.1/aims-live-2017/install-aims-desktop.desktop

@@ -8,3 +8,4 @@ Comment=Calamares — AIMS Desktop Installer
 Icon=install-aims-desktop
 Terminal=false
 Categories=Qt;
+StartupWMClass=calamares

2020.1/aims-desktop-2020/aims-collect-support-data.desktop

+[Desktop Entry]
+Encoding=UTF-8
+Name=AIMS Collect Support Data
+Comment=Posts system information to a public pastebin
+Exec=aims-collect-support-data gui
+Icon=aims-starburst
+Terminal=false
+Type=Application

2020.1/aims-desktop-2020/bin/aims-collect-support-data

+#!/bin/bash
+
+mkdir -p ~/.aims
+LOGFILE=~/.aims/$HOSTNAME
+WELCOME="This script will post system information on a public pastebin for support purposes. You will have a chance to review the data before the information is posted. Afterwards, you will receive a link that you can submit to your support department containing the support data."
+
+if [ "$1" = "gui" ]; then
+    zenity --title "AIMS Desktop Support" --info --text "$WELCOME" --icon-name="aims-starburst" --width=480
+fi
+if [ "$1" = "menu" ]; then
+    whiptail --title "AIMS Desktop Support" --msgbox \
+             "$WELCOME Use the arrow buttons to navigate and ENTER to select." 12 70
+fi
+
+echo " * Writing data to $LOGFILE..."
+
+(
+    echo -e "== Basic System Information ==\n"
+    echo    " * System Time: $(date)"
+    echo    " * Hostname: $HOSTNAME"
+    echo    " * Username: $USER"
+    echo    " * Kernel Version: $(uname -r)"
+) > $LOGFILE
+
+echo -e "\n== Memory Information ==\n" >> $LOGFILE
+free -h >> $LOGFILE
+
+echo -e "\n== Top Memory Using Processes ==\n" >> $LOGFILE
+echo '%Mem Process' >> $LOGFILE
+ps ax -o %mem -o comm | tail -n+2 | sort -nr | head >> $LOGFILE
+
+echo -e "\n== Disk Space Usage==\n" >> $LOGFILE
+df -h >> $LOGFILE
+
+echo -e "\n== PCI Devices ==\n" >> $LOGFILE
+lspci >> $LOGFILE
+
+echo -e "\n== Attached USB Devices ==\n" >> $LOGFILE
+lsusb >> $LOGFILE
+
+echo -e "\n== Network Configuration ==\n" >> $LOGFILE
+echo "Routing:" >> $LOGFILE
+/sbin/route >> $LOGFILE
+echo -e "\nInterfaces:" >> $LOGFILE
+/sbin/ifconfig >> $LOGFILE
+
+echo -e "\n== APT Status ==\n" >> $LOGFILE
+echo -e "Contents of /etc/apt/sources.list.d/:" >> $LOGFILE
+ls -1 /etc/apt/sources.list.d >> $LOGFILE
+
+echo -e "\n== CPU Information ==\n" >> $LOGFILE
+cat /proc/cpuinfo >> $LOGFILE
+
+if [ "$1" = "menu" ]; then
+    whiptail --scrolltext --title "AIMS Desktop Support" --textbox $LOGFILE 23 78
+    whiptail --title "AIMS Desktop Support" --yesno "    Submit data to pastebin?" 7 38
+    if [ "$?" = "1" ]; then
+        ACTION="abort"
+    fi
+fi
+if [ "$1" = "gui" ]; then
+    zenity --title "AIMS Desktop Support" --text-info --filename=$LOGFILE --ok-label="Submit to Pastebin" --width=480 --height=600
+    if [ "$?" = "1" ]; then
+        ACTION="abort"
+    fi
+fi
+
+if [ "$ACTION" = "abort" ]; then
+    ABORT_TEXT="Support request aborted."
+    if [ "$1" = "menu" ]; then
+        whiptail --title "AIMS Desktop Support" --msgbox "$ABORT_TEXT." 10 48 
+    fi
+    if [ "$1" = "gui" ]; then
+        zenity --title "AIMS Desktop Support" --info --text "$ABORT_TEXT" --icon-name="aims-starburst"
+    fi
+    exit 1
+fi
+
+echo " * Sending information to pastebin..."
+pastebinurl=$(pastebinit $LOGFILE)
+INFOTEXT="Information has been posted to $pastebinurl. Share that URL with your IT centre for further assistance."
+
+if [ "$1" = "menu" ]; then
+    whiptail --title "AIMS Desktop Support" --msgbox "$INFOTEXT" 10 48
+fi
+if [ "$1" = "gui" ]; then
+    zenity --title "AIMS Desktop Support" --info --text "Information has been posted to $pastebinurl. Share that URL with your IT centre for further assistance." --icon-name="aims-starburst" --width=480
+fi
+
+echo " * Pastebin URL is $pastebinurl"

2020.1/aims-desktop-2020/bin/aims-complete-install

+#!/bin/bash
+
+aims-install-rstudio
+apt-get -y install sagemath-jupyter jupyter-notebook python-notebook spyder3
+aims-install-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
+
+
+

2020.1/aims-desktop-2020/bin/aims-fix-grub-splash

+sed -i 's/GRUB_CMDLINE_LINUX_DEFAULT="quiet"/GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"/' /etc/default/grub
+update-grub

2020.1/aims-desktop-2020/bin/aims-install-irkernel

+#!/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)"
+

2020.1/aims-desktop-2020/bin/aims-install-r35

+#!/bin/bash
+
+echo "deb http://cloud.r-project.org/bin/linux/debian stretch-cran35/" > /etc/apt/sources.list.d/cran.list
+apt-key adv --keyserver=keys.gnupg.net --recv-key 'E19F5F87128899B192B1A2C2AD5F960A256A04AF'
+apt-get -qq update
+apt-get -y install r-base r-base-dev r-recommended
+
+echo "You may want to:"
+echo " * sudo apt-get -y autoremove"
+echo " * sudo apt-get clean"
+echo " * re-install any R packages in ~/.local/lib/R/site-packages or /usr/local/lib/R/site-packages"
+echo " * specifically IRkernel, by removing /usr/local/lib/R/site-packages/* and then sudo aims-install-irkernel"
+
+

2020.1/aims-desktop-2020/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
+