diff --git a/tcet-welcome/scripts/about.py b/tcet-welcome/scripts/about.py index 8f3999d..50036ed 100755 --- a/tcet-welcome/scripts/about.py +++ b/tcet-welcome/scripts/about.py @@ -3,15 +3,14 @@ import gi gi.require_version("Gtk", "3.0") from gi.repository import Gtk -from os import environ # get install dir relative to $home -# we have to do this because when we start the program from terminal its executed in the ~/.local/share/tcet-welcome +# we have to do this because when we start the program from terminal its executed in the /usr/local/share/tcet-welcome # when we auto start welcome.sh from the .desktop in ~/.config/autostart it is executed in the $HOME dir and our relative paths are broken -# so using the $HOME env variable get the path GTK more specifically set_from_file() / set_icon_from_file wont let you user ~/.local/share/tcet-welcome +# so using the $HOME env variable get the path GTK more specifically set_from_file() / set_icon_from_file wont let you user /usr/local/share/tcet-welcome -installDir = environ['HOME']+'/.local/share/tcet-welcome' +installDir = '/usr/local/share/tcet-welcome' class aboutWin(Gtk.Window): diff --git a/tcet-welcome/scripts/installer.py b/tcet-welcome/scripts/installer.py index a53d8cc..7b8dd62 100755 --- a/tcet-welcome/scripts/installer.py +++ b/tcet-welcome/scripts/installer.py @@ -4,7 +4,6 @@ gi.require_version('Gtk', '3.0') from gi.repository import Gtk import subprocess -from os import environ package_map = { "NodeJS": "nodejs", @@ -19,7 +18,7 @@ "GoLang":"go" } -installDir = environ['HOME']+'/.local/share/tcet-welcome' +installDir = '/usr/local/share/tcet-welcome' class MyApp(Gtk.Window): def __init__(self): diff --git a/tcet-welcome/scripts/py-about.sh b/tcet-welcome/scripts/py-about.sh index 1f9e02b..c1b7d71 100755 --- a/tcet-welcome/scripts/py-about.sh +++ b/tcet-welcome/scripts/py-about.sh @@ -1,9 +1,9 @@ #!/usr/bin/bash -NINSTANCES=$(ps aux | grep python\ $HOME/.local/share/tcet-welcome/scripts/about.py | wc -l ) +NINSTANCES=$(ps aux | grep python\ /usr/local/share/tcet-welcome/scripts/about.py | wc -l ) target="1" if [ "$NINSTANCES" = "$target" ] then - bash -c "python ~/.local/share/tcet-welcome/scripts/about.py" + bash -c "python /usr/local/share/tcet-welcome/scripts/about.py" fi diff --git a/tcet-welcome/scripts/py-installer.sh b/tcet-welcome/scripts/py-installer.sh index f6359da..9cf4bb8 100755 --- a/tcet-welcome/scripts/py-installer.sh +++ b/tcet-welcome/scripts/py-installer.sh @@ -1,9 +1,9 @@ #!/usr/bin/bash -NINSTANCES=$(ps aux | grep python\ $HOME/.local/share/tcet-welcome/scripts/installer.py | wc -l ) +NINSTANCES=$(ps aux | grep python\ /usr/local/share/tcet-welcome/scripts/installer.py | wc -l ) target="1" if [ "$NINSTANCES" = "$target" ] then - bash -c "python ~/.local/share/tcet-welcome/scripts/installer.py" + bash -c "python /usr/local/share/tcet-welcome/scripts/installer.py" fi diff --git a/welcome b/welcome index 220eb05..2c1f436 100755 --- a/welcome +++ b/welcome @@ -1,6 +1,6 @@ #!/bin/env bash -DIR=~/.local/share/tcet-welcome +DIR=/usr/local/share/tcet-welcome yad --title "Welcome" \ --form \ diff --git a/welcome-after b/welcome-after index ff257ed..fed6aa1 100755 --- a/welcome-after +++ b/welcome-after @@ -1,6 +1,6 @@ #!/bin/env bash -DIR=~/.local/share/tcet-welcome +DIR=/usr/local/share/tcet-welcome yad --title "Welcome" \ --form \