From 2ab620157a62e8e198916990ad4cec513ad5ef1e Mon Sep 17 00:00:00 2001
From: "Eugenio Paolantonio (g7)" <me@medesimo.eu>
Date: Sat, 21 Dec 2013 18:41:27 +0100
Subject: [PATCH] Added linstaller-session.

---
 .gitignore                    |  1 +
 linstaller/core/main.py       |  2 +-
 session/linstaller.desktop    |  7 +++++++
 session/linstaller_session.sh | 26 ++++++++++++++++++++++++++
 setup.py                      |  5 +++--
 5 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 session/linstaller.desktop
 create mode 100755 session/linstaller_session.sh

diff --git a/.gitignore b/.gitignore
index a295864..7040120 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.pyc
 __pycache__
+config/default
diff --git a/linstaller/core/main.py b/linstaller/core/main.py
index 447dd9a..fdcb846 100644
--- a/linstaller/core/main.py
+++ b/linstaller/core/main.py
@@ -5,7 +5,7 @@
 # This is a module of linstaller, should not be executed as a standalone application.
 
 ####
-VERSION = "5.21.0"
+VERSION = "5.22.0"
 ####
 
 import os, sys, traceback
diff --git a/session/linstaller.desktop b/session/linstaller.desktop
new file mode 100644
index 0000000..d4daa60
--- /dev/null
+++ b/session/linstaller.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Installation
+Comment=Launch the installation wizard
+Exec=/usr/bin/linstaller_session.sh
+TryExec=/usr/bin/linstaller_session.sh
+Icon=gtk-save
+Type=Application
diff --git a/session/linstaller_session.sh b/session/linstaller_session.sh
new file mode 100755
index 0000000..ec66a20
--- /dev/null
+++ b/session/linstaller_session.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# linstaller session - (C) 2013 Eugenio "g7" Paolantonio.
+# All rights reserved. Work released under the GNU GPL license, version 3 or later.
+#
+
+if [ "$1" ]; then
+	CONFIG="/etc/linstaller/$1"
+else
+	CONFIG="/etc/linstaller/default"
+fi
+
+# If default, read the link and see if there is a -fullscreen configuration (e.g. semplice-fullscreen):
+if [ "$CONFIG" == "/etc/linstaller/default" ]; then
+	LNK="`readlink $CONFIG`"
+	[ -e "$LNK-fullscreen" ] && CONFIG="$LNK-fullscreen"
+fi
+
+if [ "$2" == "__internal" ]; then
+	/usr/bin/linstaller_crash_wrapper.sh -f=glade -c=`basename $CONFIG` start
+	sudo reboot
+	exit
+else
+	# Launch openbox and linstaller
+	exec /usr/bin/openbox --startup "/usr/bin/linstaller_session.sh `basename $CONFIG` __internal"
+fi
diff --git a/setup.py b/setup.py
index 640c712..bfadb17 100644
--- a/setup.py
+++ b/setup.py
@@ -47,14 +47,15 @@ def search_for_glade():
 
 data, symlinks = search_for_glade()
 data_files = [
-	("/usr/bin", ["linstaller_wrapper.sh", "linstaller_crash_wrapper.sh", "mount_nolive.sh"]),
+	("/usr/bin", ["linstaller_wrapper.sh", "linstaller_crash_wrapper.sh", "session/linstaller_session.sh", "mount_nolive.sh"]),
 	("/etc/linstaller", ["config/semplice", "config/semplice.glade", "config/semplice-base", "config/semplice-nolive", "config/semplice-nolive.glade", "config/ubuntu", "config/ubuntu-nolive", "config/semplice-persistent", "config/semplice-persistent-nolive", "config/semplice-raspberrypi", "config/semplice-fullscreen", "config/semplice-fullscreen.glade"]),
 	("/usr/share/alan/alan/ext", ["alan/linstaller_alan.py"]),
+	("/usr/share/xsessions", ["session/linstaller.desktop"]),
 ]
 data_files += data
 
 distrib = setup(name='linstaller',
-      version='5.21.0',
+      version='5.22.0',
       description='Modular, preseedable, GNU/Linux distribution installer',
       author='Eugenio Paolantonio and the Semplice Team',
       author_email='me@medesimo.eu',