Skip to content

Commit

Permalink
refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
mudler committed Aug 8, 2016
1 parent b6ec725 commit 71af544
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
all: install

install:
install -m 755 -d $(DESTDIR)/usr/share/sabayon-welcome
install -Dm755 sabayon-welcome $(DESTDIR)/usr/bin/sabayon-welcome
install -Dm755 sabayon-welcome.desktop $(DESTDIR)/usr/share/applications/sabayon-welcome.desktop
install -Dm755 sabayon-welcome.desktop $(DESTDIR)/etc/skel/.config/autostart/sabayon-welcome.desktop
cp -R data/* $(DESTDIR)/usr/share/sabayon-welcome/
install -m 755 -d $(DESTDIR)/usr/share/sabayon-greeter
install -Dm755 sabayon-greeter $(DESTDIR)/usr/bin/sabayon-greeter
install -Dm755 sabayon-greeter.desktop $(DESTDIR)/usr/share/applications/sabayon-greeter.desktop
install -Dm755 sabayon-greeter.desktop $(DESTDIR)/etc/skel/.config/autostart/sabayon-greeter.desktop
cp -R data/* $(DESTDIR)/usr/share/sabayon-greeter/
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
sabayon-welcome
sabayon-greeter
================

Sabayon welcome screen
Expand Down
12 changes: 6 additions & 6 deletions sabayon-welcome → sabayon-greeter
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class WelcomeConfig(object):

# store full path to our autostart symlink
self._autostart_path = os.path.expanduser(
'~/.config/autostart/sabayon-welcome.desktop')
'~/.config/autostart/sabayon-greeter.desktop')

# ensure our config directory exists
if not os.path.exists(self._config_dir):
Expand All @@ -91,7 +91,7 @@ class WelcomeConfig(object):
# create the autostart symlink
try:
os.symlink(
'/usr/share/applications/sabayon-welcome.desktop',
'/usr/share/applications/sabayon-greeter.desktop',
self._autostart_path)
except OSError:
pass
Expand Down Expand Up @@ -218,11 +218,11 @@ class WelcomeApp(object):
print('Using relative path for data source.\
Non-production testing.')
self._data_path = os.path.join(self._location, 'data/')
elif(os.path.exists('/usr/share/sabayon-welcome/')):
print('Using /usr/share/sabayon-welcome/ path.')
self._data_path = '/usr/share/sabayon-welcome/'
elif(os.path.exists('/usr/share/sabayon-greeter/')):
print('Using /usr/share/sabayon-greeter/ path.')
self._data_path = '/usr/share/sabayon-greeter/'
else:
print('Unable to source the sabayon-welcome data directory.')
print('Unable to source the sabayon-greeter data directory.')
sys.exit(1)

self._build_app()
Expand Down
4 changes: 2 additions & 2 deletions sabayon-welcome.desktop → sabayon-greeter.desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ Terminal=false
Type=Application
Categories=GNOME;GTK;System;
StartupNotify=false
Name=Sabayon Welcome
Exec=sabayon-welcome
Name=Sabayon Greeter
Exec=sabayon-greeter
Icon=gtk-info
Comment=The Sabayon Welcome utility.
Name[de_DE.UTF-8]=Sabayon Welcome

0 comments on commit 71af544

Please sign in to comment.