Skip to content

Commit

Permalink
Added linstaller-session.
Browse files Browse the repository at this point in the history
  • Loading branch information
g7 committed Dec 21, 2013
1 parent 44d23a4 commit 2ab6201
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*.pyc
__pycache__
config/default
2 changes: 1 addition & 1 deletion linstaller/core/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions session/linstaller.desktop
Original file line number Diff line number Diff line change
@@ -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
26 changes: 26 additions & 0 deletions session/linstaller_session.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 3 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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='[email protected]',
Expand Down

0 comments on commit 2ab6201

Please sign in to comment.