Auto migrate to primtux3

migrate_to_primtux4.sh

 #!/bin/bash
 
 DIR=$(dirname $0)
+PROXY_URL="http://dnsproxy:3128"
+export HTTPS_PROXY="$PROXY_URL"
 git fetch --all
-git checkout -b Primtux3-migration Primtux3-migration
-$DIR/migrate_to_primtux4.sh
+git reset --hard HEAD
+git branch -D Primtux3-migration
+git checkout -b Primtux3-migration origin/Primtux3-migration
+if [ $? -eq 0 ]
+then
+    git pull
+    $DIR/migrate_to_primtux4.sh
+else
+    echo "Fail to switch branches"
+fi
 

upgrade-session.sh

@@ -44,6 +44,11 @@ $DIR/upgrade_repository.sh
 $DIR/fix_xscreensaver.sh
 $DIR/fix_pcmanfm.sh
 
+if [ ! -e /etc/primtux-version ]
+then
+    $DIR/migrate_to_primtux4.sh
+fi
+
 # Install missing libreoffice gtk
 if [ -z "`dpkg -l | grep libreoffice-gtk`" ]
 then
@@ -52,5 +57,5 @@ fi
 
 if [ $(who | wc -l) -eq 1 ]
 then
-    poweroff
+    echo poweroff
 fi