diff --git a/Dockerfile b/Dockerfile index 1369cff..555317d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,6 +20,7 @@ RUN apt-get update && \ less \ locales \ nano \ + obconf \ openbox \ sudo \ tigervnc-common \ diff --git a/README.md b/README.md index 4c9cc22..97c4859 100644 --- a/README.md +++ b/README.md @@ -94,14 +94,15 @@ Default: UTC Set a background image for the openbox desktop \ Default: None \ Image Links: -[1](http://digitalblasphemy.com/graphics/HDfree/metallurgy1HDfree.jpg) / -[2](http://digitalblasphemy.com/graphics/HDfree/portals1HDfree.jpg) / -[3](http://digitalblasphemy.com/graphics/HDfree/cronusrising2k141HDfree.jpg) / -[4](http://digitalblasphemy.com/graphics/HDfree/harbinger2k91HDfree.jpg) / -[5](http://digitalblasphemy.com/graphics/HDfree/arcana2HDfree.jpg) / -[6](http://digitalblasphemy.com/graphics/HDfree/rivenHDfree.jpg) / -[7](http://digitalblasphemy.com/graphics/HDfree/circularlogicHDfree.jpg) / -[8](http://digitalblasphemy.com/graphics/HDfree/gardener2k121HDfree.jpg) \ +[1](https://www.rapidlinux.org/udwp/metallurgy1HDfree.jpg) / +[2](https://www.rapidlinux.org/udwp/portals1HDfree.jpg) / +[3](https://www.rapidlinux.org/udwp/cronusrising2k141HDfree.jpg) / +[4](https://www.rapidlinux.org/udwp/harbinger2k91HDfree.jpg) / +[5](https://www.rapidlinux.org/udwp/arcana2HDfree.jpg) / +[6](https://www.rapidlinux.org/udwp/rivenHDfree.jpg) / +[7](https://www.rapidlinux.org/udwp/circularlogicHDfree.jpg) / +[8](https://www.rapidlinux.org/udwp/gardener2k121HDfree.jpg) / +[9](https://www.rapidlinux.org/udwp/overseer2k141_single_1920x1080.jpg) \ Layout Options: fill / extend / full / tile / cover / center \ Default Layout: center ``` diff --git a/bin/set_wallpaper.sh b/bin/set_wallpaper.sh index 44992cc..d1e4353 100755 --- a/bin/set_wallpaper.sh +++ b/bin/set_wallpaper.sh @@ -6,14 +6,15 @@ if [ -z "$1" ]; then fi case "$1" in - 1) WPURL="http://digitalblasphemy.com/graphics/HDfree/metallurgy1HDfree.jpg" ;; - 2) WPURL="http://digitalblasphemy.com/graphics/HDfree/portals1HDfree.jpg" ;; - 3) WPURL="http://digitalblasphemy.com/graphics/HDfree/cronusrising2k141HDfree.jpg" ;; - 4) WPURL="http://digitalblasphemy.com/graphics/HDfree/harbinger2k91HDfree.jpg" ;; - 5) WPURL="http://digitalblasphemy.com/graphics/HDfree/arcana2HDfree.jpg" ;; - 6) WPURL="http://digitalblasphemy.com/graphics/HDfree/rivenHDfree.jpg" ;; - 7) WPURL="http://digitalblasphemy.com/graphics/HDfree/circularlogicHDfree.jpg" ;; - 8) WPURL="http://digitalblasphemy.com/graphics/HDfree/gardener2k121HDfree.jpg" ;; + 1) WPURL="https://www.rapidlinux.org/udwp/metallurgy1HDfree.jpg" ;; + 2) WPURL="https://www.rapidlinux.org/udwp/portals1HDfree.jpg" ;; + 3) WPURL="https://www.rapidlinux.org/udwp/cronusrising2k141HDfree.jpg" ;; + 4) WPURL="https://www.rapidlinux.org/udwp/harbinger2k91HDfree.jpg" ;; + 5) WPURL="https://www.rapidlinux.org/udwp/arcana2HDfree.jpg" ;; + 6) WPURL="https://www.rapidlinux.org/udwp/rivenHDfree.jpg" ;; + 7) WPURL="https://www.rapidlinux.org/udwp/circularlogicHDfree.jpg" ;; + 8) WPURL="https://www.rapidlinux.org/udwp/gardener2k121HDfree.jpg" ;; + 9) WPURL="https://www.rapidlinux.org/udwp/overseer2k141_single_1920x1080.jpg" ;; *) WPURL="0" ;; esac diff --git a/conf/menu.xml b/conf/menu.xml index a30ee96..874ef9b 100644 --- a/conf/menu.xml +++ b/conf/menu.xml @@ -29,6 +29,7 @@ /app/scripts/medit.sh /app/scripts/bluefish.sh /app/scripts/geany.sh + /app/scripts/thonny.sh /app/scripts/sublimetext.sh /app/scripts/vscode.sh /app/scripts/netbeans.sh @@ -160,6 +161,7 @@ + obconf diff --git a/scripts/install_nomachine.sh b/scripts/install_nomachine.sh new file mode 100755 index 0000000..08138d7 --- /dev/null +++ b/scripts/install_nomachine.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +set -e + +export DEBIAN_FRONTEND="noninteractive" +URL="https://download.nomachine.com/download/8.11/Linux/nomachine_8.11.3_4_amd64.deb" +DEB="/tmp/nomachine.deb" + +wget ${URL} -O ${DEB} +dpkg -i ${DEB} || (set -e; apt-get update; apt-get install -f -y) +rm ${DEB} + diff --git a/scripts/install_torbrowser.sh b/scripts/install_torbrowser.sh index 911a3aa..0f2a15b 100755 --- a/scripts/install_torbrowser.sh +++ b/scripts/install_torbrowser.sh @@ -8,10 +8,20 @@ set -e export DEBIAN_FRONTEND="noninteractive" apt-get update -apt-get install -y file libgtk-3-0 libdbus-glib-1-2 wget xz-utils gnupg2 +apt-get install -y file gnupg2 libasound2 libgtk-3-0 libdbus-glib-1-2 wget xz-utils -TORPKG=`curl -s https://www.torproject.org/download/ 2>/dev/null | grep 'Download for Linux' | tr '"' '\n' | grep linux64` -TORSIG=`curl -s https://www.torproject.org/download/ 2>/dev/null | grep Signature | tr '"' '\n' | grep tar.xz.asc` +TORPKG=`curl -s https://www.torproject.org/download/ 2>/dev/null | grep 'Download for Linux' | tr '"' '\n' | grep linux-x86_64 || true` +TORSIG=`curl -s https://www.torproject.org/download/ 2>/dev/null | grep Signature | tr '"' '\n' | grep tar.xz.asc || true` + +if [ -z "${TORPKG}" ]; then + echo "Hyperlinks have changed! TORPKG is not valid!" + exit 1 +fi + +if [ -z "${TORSIG}" ]; then + echo "Hyperlinks have changed! TORSIG is not valid!" + exit 2 +fi # Download package wget https://www.torproject.org/${TORPKG} -O /tmp/tor.tar.xz @@ -21,9 +31,15 @@ gpg --verify /tmp/tor.tar.xz.asc /tmp/tor.tar.xz # Install package tar xf /tmp/tor.tar.xz -C /opt -rm /tmp/tor.tar.xz /tmp/tor.tar.xz.asc +if [ ! -d /opt/tor-browser ]; then + echo "tor-browser not found under /tmp/tor.tar.xz!" + exit 3 +fi # Tweak package -mv /opt/tor-browser_* /opt/tor +mv /opt/tor-browser /opt/tor sed -e 's/"`id -u`" -eq 0/`false`/g' -i /opt/tor/Browser/start-tor-browser sed -e 's/$SYSARCHITECTURE -ne $TORARCHITECTURE/"$SYSARCHITECTURE" != "$TORARCHITECTURE"/g' -i /opt/tor/Browser/start-tor-browser + +# Clean-up +rm /tmp/tor.tar.xz /tmp/tor.tar.xz.asc diff --git a/scripts/launch_torbrowser.sh b/scripts/launch_torbrowser.sh index 0a6baf4..a851dbf 100755 --- a/scripts/launch_torbrowser.sh +++ b/scripts/launch_torbrowser.sh @@ -6,5 +6,4 @@ if [ ! -x /opt/tor/start-tor-browser.desktop ]; then xterm -T InstallTorBrowser -g 100x30 -e sudo /app/scripts/install_torbrowser.sh fi -cd /opt/tor/ -./start-tor-browser.desktop +/opt/tor/Browser/start-tor-browser --detach diff --git a/scripts/thonny.sh b/scripts/thonny.sh new file mode 100755 index 0000000..0b058bb --- /dev/null +++ b/scripts/thonny.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +export DEBIAN_FRONTEND="noninteractive" +BINARY="thonny" + +BINARYLOC=`which ${BINARY}` +if [ "$?" -ne "0" ]; then + set -e + + xterm -T AptGetUpdate -g 100x30 -e sudo apt-get update + xterm -T AptGetInstall -g 100x30 -e sudo apt-get install -y ${BINARY} +fi + +${BINARY} diff --git a/tests/tor.sh b/tests/tor.sh index 47929af..e4e9be9 100755 --- a/tests/tor.sh +++ b/tests/tor.sh @@ -2,7 +2,7 @@ set -e -TORPKG=`curl https://www.torproject.org/download/ 2>/dev/null | grep 'Download for Linux' | tr '"' '\n' | grep linux64` +TORPKG=`curl https://www.torproject.org/download/ 2>/dev/null | grep 'Download for Linux' | tr '"' '\n' | grep x86_64` TORSIG=`curl https://www.torproject.org/download/ 2>/dev/null | grep Signature | tr '"' '\n' | grep tar.xz.asc` wget https://www.torproject.org/${TORPKG} -O /tmp/tor.tar.xz