Update Firefox version.

[config] / jessie_postinstall.sh

diff --git a/jessie_postinstall.sh b/jessie_postinstall.sh
index 419805ff33e67c35e2586e9200385d6a94ae35e6..0b628e520d87425aea8106a8e060efea46042dc4 100755 (executable)
--- a/jessie_postinstall.sh
+++ b/jessie_postinstall.sh
@@ -28,7 +28,7 @@ elif [ "$3" = "test.plomlompom.com" ]; then
 elif [ "$2" = "public" ]; then
     hostname="htwtxt.plomlompom"
 elif [ "$2" = "X200s" ]; then
-    hostname="X220s"
+    hostname="X200s"
 elif [ "$2" = "T450s" ]; then
     hostname="T450s"
 fi
@@ -118,6 +118,10 @@ if [ "$1" = "thinkpad" ]; then
 '#START_CHARGE_THRESH_BAT0/' /etc/default/tlp
     sed -i 's/^#STOP_CHARGE_THRESH_BAT0/STOP_CHARGE_THRESH_BAT0=95 '\
 '#STOP_CHARGE_THRESH_BAT0/' /etc/default/tlp
+    sed -i 's/^#START_CHARGE_THRESH_BAT1/START_CHARGE_THRESH_BAT0=10 '\
+'#START_CHARGE_THRESH_BAT1/' /etc/default/tlp
+    sed -i 's/^#STOP_CHARGE_THRESH_BAT1/STOP_CHARGE_THRESH_BAT0=95 '\
+'#STOP_CHARGE_THRESH_BAT1/' /etc/default/tlp
     sed -i 's/^#DEVICES_TO_DISABLE_ON_STARTUP/DEVICES_TO_DISABLE_ON_STARTUP='\
 '"bluetooth wifi wwan" #DEVICES_TO_DISABLE_ON_STARTUP/' /etc/default/tlp
     tlp start
@@ -192,7 +196,7 @@ if [ "$1" = "server" ]; then
     newaliases
     service postfix restart
     if [ "$2" = "personal" ]; then
-    apt-get -y install getmail4 procmail
+        apt-get -y install getmail4 procmail
     fi
 
     # Set up regular system update reminder.
@@ -259,13 +263,20 @@ if [ "$1" = "server" ]; then
         ln -s /home/plom/dump/ /var/www/html/dump
         su - plom -c 'mkdir -p /home/plom/geheim'
         ln -s /home/plom/geheim/ /var/www/html/geheim
-        su - plom -c 'mkdir -p /home/plom/lifelog'
-        ln -s /home/plom/lifelog/ /var/www/html/lifelog
-        su - plom -c 'git init --bare /home/plom/lifelog.git'
-        su - plom -c 'touch /home/plom/lifelog.git/hooks/post-update'
-        su - plom -c 'chmod a+x /home/plom/lifelog.git/hooks/post-update'
-        su - plom -c 'echo "#!/bin/sh" > /home/plom/lifelog.git/hooks/post-update'
-        su - plom -c 'echo "GIT_WORK_TREE=/home/plom/lifelog git checkout -f" >> /home/plom/lifelog.git/hooks/post-update'
+        su - plom -c 'mkdir -p /home/plom/lesekreis'
+        ln -s /home/plom/geheim/ /var/www/html/lesekreis
+        su - plom -c 'mkdir -p /home/plom/zettel'
+        ln -s /home/plom/zettel/ /var/www/html/zettel
+        su - plom -c 'git init --bare /home/plom/zettel.git'
+        su - plom -c 'cp ~/config/systemfiles/post-update ~/zettel.git/hooks/'
+        su - plom -c 'chmod a+x /home/plom/zettel.git/hooks/post-update'
+
+        # Install website generator tools
+        apt-get -y install pandoc wget
+        wget http://news.dieweltistgarnichtso.net/bin/archives/redo-sh.tar.gz
+        tar -oxzf redo-sh.tar.gz -C /usr/local
+        rm redo-sh.tar.gz
+        apt-get --purge autoremove wget
     fi
 
 elif [ "$1" = "thinkpad" ]; then
@@ -308,7 +319,7 @@ elif [ "$1" = "thinkpad" ]; then
     apt-get -y install x11-xserver-utils
 
     # Set up pentadactyl. 
-    apt-get -y install iceweasel
+    apt-get -y install iceweasel xul-ext-noscript
     apt-get -y -t jessie-backports install xul-ext-pentadactyl
     apt-get -y install vim-gtk
     su plom -c 'mkdir -p /home/plom/downloads/'