write a proper Makefile, rearrange source code a bit

52 files changed, 55 insertions, 270 deletions

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..5d2c1e1
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,54 @@
+SUBDIRS =
+DESTDIR = 
+UBINDIR ?= /usr/bin
+DESKTOPDIR ?= /usr/share/applications
+PIXMAPDIR ?= /usr/share/pixmaps
+SISYPHUSDATADIR ?= /usr/share/sisyphus
+SISYPHUSSHLIBDIR ?= /usr/lib64/sisyphus
+SISYPHUSPYLIBDIR ?= /usr/lib64/python3.4
+POLKITDIR ?= /usr/share/polkit-1/actions
+
+all:
+	for d in $(SUBDIRS); do $(MAKE) -C $$d; done
+
+clean:
+	for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done
+
+install:
+	for d in $(SUBDIRS); do $(MAKE) -C $$d install; done
+
+	install -d $(DESTDIR)$(UBINDIR)
+	install -m 0755 sisyphus-gui $(DESTDIR)$(UBINDIR)/
+	install -m 0755 sisyphus-gui-pkexec $(DESTDIR)$(UBINDIR)/
+	install -m 0755 src/frontend/cli/sisyphus-cli.sh $(DESTDIR)$(UBINDIR)/
+	install -m 0755 src/frontend/cli/sisyphus-cli.py $(DESTDIR)$(UBINDIR)/
+	install -d $(DESTDIR)$(SISYPHUSSHLIBDIR)
+	install -m 0644 src/backend/libsisyphus.sh $(DESTDIR)$(SISYPHUSSHLIBDIR)/
+	install -d $(DESTDIR)$(SISYPHUSPYLIBDIR)
+	install -m 0644 src/backend/libsisyphus.py $(DESTDIR)$(SISYPHUSPYLIBDIR)/
+	install -d $(DESTDIR)$(SISYPHUSDATADIR)
+	install -d $(DESTDIR)$(SISYPHUSDATADIR)/helpers
+	install -d $(DESTDIR)$(SISYPHUSDATADIR)/icon
+	install -d $(DESTDIR)$(SISYPHUSDATADIR)/ui
+	install -m 0755 src/helpers/* $(DESTDIR)$(SISYPHUSDATADIR)/helpers/
+	install -m 0755 src/frontend/gui/*.py $(DESTDIR)$(SISYPHUSDATADIR)/
+	install -m 0755 src/frontend/gui/icon/* $(DESTDIR)$(SISYPHUSDATADIR)/icon/
+	install -m 0755 src/frontend/gui/ui/* $(DESTDIR)$(SISYPHUSDATADIR)/ui/
+	install -d $(DESTDIR)$(DESKTOPDIR)
+	install -m 0755 sisyphus-gui.desktop $(DESTDIR)$(DESKTOPDIR)/
+	install -d $(DESTDIR)$(PIXMAPDIR)
+	install -m 0644 sisyphus-gui.png $(DESTDIR)$(PIXMAPDIR)
+	install -d $(DESTDIR)$(POLKITDIR)
+	install -m 0644 org.redcorelinux.sisyphus-gui.policy $(DESTDIR)$(POLKITDIR)/
+
+uninstall:
+	rm -rf $(DESTDIR)$(UBINDIR)/sisyphus-cli.sh
+	rm -rf $(DESTDIR)$(UBINDIR)/sisyphus-cli.py
+	rm -rf $(DESTDIR)$(UBINDIR)/sisyphus-gui
+	rm -rf $(DESTDIR)$(UBINDIR)/sisyphus-gui-pkexec
+	rm -rf $(DESTDIR)$(DESKTOPDIR)/sisyphus-gui.desktop
+	rm -rf $(DESTDIR)$(PIXMAPDIR)/sisyphus-gui.png
+	rm -rf $(DESTDIR)$(POLKITDIR)/org.redcorelinux.sisyphus-gui.policy
+	rm -rf $(DESTDIR)$(SISYPHUSDATADIR)
+	rm -rf $(DESTDIR)$(SISYPHUSSHLIBDIR)
+	rm -rf $(DESTDIR)$(SISYPHUSPYLIBDIR)/libsisyphus.py
diff --git a/backend/libsisyphus.py b/backend/libsisyphus.py
deleted file mode 100755
index 5dff073..0000000
--- a/backend/libsisyphus.py
+++ /dev/null
@@ -1,229 +0,0 @@
-#!/usr/bin/python3
-
-import csv
-import filecmp
-import os
-import shutil
-import sqlite3
-import sys
-import urllib3
-import subprocess
-
-redcore_portage_tree_path = '/usr/portage'
-redcore_desktop_overlay_path = '/var/lib/layman/redcore-desktop'
-redcore_portage_config_path = '/opt/redcore-build'
-
-sisyphus_remote_csv_url = 'http://mirror.math.princeton.edu/pub/redcorelinux/csv/remote_preinst.csv'
-sisyphus_remote_csv_path_pre = '/var/lib/sisyphus/csv/remote_preinst.csv'
-sisyphus_remote_csv_path_post = '/var/lib/sisyphus/csv/remote_postinst.csv'
-sisyphus_local_csv_path_pre = '/var/lib/sisyphus/csv/local_preinst.csv'
-sisyphus_local_csv_path_post = '/var/lib/sisyphus/csv/local_postinst.csv'
-sisyphus_database_path = '/var/lib/sisyphus/db/sisyphus.db'
-def check_if_root():
-    if not os.getuid() == 0:
-        sys.exit("you need root permissions to do this. exiting!")
-
-def check_if_srcmode():
-    portage_srcmode_make_conf = '/opt/redcore-build/conf/intel/portage/make.conf.amd64-srcmode'
-    portage_make_conf_symlink = '/etc/portage/make.conf'
-
-    if os.path.islink(portage_make_conf_symlink) and os.path.realpath(portage_make_conf_symlink) == portage_srcmode_make_conf:
-        print("the system is set to srcmode (full gentoo), refusing to run!")
-        sys.exit(1)
-
-def check_redcore_portage_tree():
-    os.chdir(redcore_portage_tree_path)
-    subprocess.call(['git', 'remote', 'update'])
-    redcore_portage_tree_local_hash = subprocess.check_output(['git', 'rev-parse', '@'])
-    redcore_portage_tree_remote_hash = subprocess.check_output(['git', 'rev-parse', '@{u}'])
-
-    if not redcore_portage_tree_local_hash == redcore_portage_tree_remote_hash:
-        print("redcore desktop portage tree is out-of-date. run 'sisyphus update' first!")
-        sys.exit(1)
-
-def check_redcore_desktop_overlay():
-    os.chdir(redcore_desktop_overlay_path)
-    subprocess.call(['git', 'remote', 'update'])
-    redcore_desktop_overlay_local_hash = subprocess.check_output(['git', 'rev-parse', '@'])
-    redcore_desktop_overlay_remote_hash = subprocess.check_output(['git', 'rev-parse', '@{u}'])
-
-    if not redcore_desktop_overlay_local_hash == redcore_desktop_overlay_remote_hash:
-        print("redcore desktop overlay is out-of-date. run 'sisyphus update' first!")
-        sys.exit(1)
-
-def check_redcore_portage_config():
-    os.chdir(redcore_portage_config_path)
-    subprocess.call(['git', 'remote', 'update'])
-    redcore_portage_config_local_hash = subprocess.check_output(['git', 'rev-parse', '@'])
-    redcore_portage_config_remote_hash = subprocess.check_output(['git', 'rev-parse', '@{u}'])
-
-    if not redcore_portage_config_local_hash == redcore_portage_config_remote_hash:
-        print("redcore desktop portage config is out-of-date. run 'sisyphus update' first!")
-        sys.exit(1)
-
-def fetch_sisyphus_remote_packages_table_csv():
-    http = urllib3.PoolManager()
-    
-    if not os.path.isfile(sisyphus_remote_csv_path_pre):
-        os.mknod(sisyphus_remote_csv_path_pre)
-        with http.request('GET', sisyphus_remote_csv_url, preload_content=False) as tmp_buffer, open(sisyphus_remote_csv_path_post, 'wb') as output_file:       
-            shutil.copyfileobj(tmp_buffer, output_file)
-    else:
-        with http.request('GET', sisyphus_remote_csv_url, preload_content=False) as tmp_buffer, open(sisyphus_remote_csv_path_post, 'wb') as output_file:
-            shutil.copyfileobj(tmp_buffer, output_file)
-
-def check_sisyphus_remote_packages_table_csv():
-    if not filecmp.cmp(sisyphus_remote_csv_path_pre, sisyphus_remote_csv_path_post):
-        print("sisyphus database remote_packages table is out-of-date. run 'sisyphus update' first!")
-        os.remove(sisyphus_remote_csv_path_post)
-        sys.exit(1)
-    else:
-        os.remove(sisyphus_remote_csv_path_post)
-
-def check_sisyphus_remote_packages_table():
-    fetch_sisyphus_remote_packages_table_csv()
-    check_sisyphus_remote_packages_table_csv()
-
-def check_sync():
-    check_if_root()
-    check_redcore_portage_tree()
-    check_redcore_desktop_overlay()
-    check_redcore_portage_config()
-    check_sisyphus_remote_packages_table()
-
-def sync_redcore_portage_tree_and_desktop_overlay():
-    subprocess.call(['emerge', '--sync'])
-
-def sync_redcore_portage_config():
-    os.chdir(redcore_portage_config_path)
-    print(">>> Syncing 'portage config' into '/etc/portage'...")
-    print("/usr/bin/git pull")
-    subprocess.call(['git', 'pull'])
-    print("=== Sync completed for 'portage config'")
-
-def sync_sisyphus_remote_packages_table_csv():
-    if not filecmp.cmp(sisyphus_remote_csv_path_pre, sisyphus_remote_csv_path_post):
-        print(">>> Syncing 'sisyphus database remote_packages table' into '/var/lib/sisyphus/db/sisyphus.db'")
-        print("/usr/bin/sqlite3 /var/lib/sisyphus/db/sisyphus.db")
-        sisyphusdb = sqlite3.connect(sisyphus_database_path)
-        sisyphusdb.cursor().execute('''drop table if exists remote_packages''')
-        sisyphusdb.cursor().execute('''create table remote_packages (category TEXT,name TEXT,version TEXT,slot TEXT,description TEXT)''')
-        with open(sisyphus_remote_csv_path_post) as sisyphus_remote_csv:
-            for row in csv.reader(sisyphus_remote_csv):
-                sisyphusdb.cursor().execute("insert into remote_packages (category, name, version, slot, description) values (?, ?, ?, ?, ?);", row)
-        sisyphusdb.commit()
-        sisyphusdb.close()
-        print("=== Sync completed for 'sisyphus database remote_packages table'")
-    else:
-        print(">>> Syncing 'sisyphus database remote_packages table' into '/var/lib/sisyphus/db/sisyphus.db'")
-        print("/usr/bin/sqlite3 /var/lib/sisyphus/db/sisyphus.db")
-        print("Already up-to-date.")
-        print("=== Sync completed for 'sisyphus database remote_packages table'")
-    shutil.move(sisyphus_remote_csv_path_post, sisyphus_remote_csv_path_pre)
-        
-def sync_sisyphus_database_remote_packages_table():
-    fetch_sisyphus_remote_packages_table_csv()
-    sync_sisyphus_remote_packages_table_csv()
-
-def redcore_sync():
-    check_if_root()
-    sync_redcore_portage_tree_and_desktop_overlay()
-    sync_redcore_portage_config()
-    sync_sisyphus_database_remote_packages_table()
-
-def generate_sisyphus_local_packages_table_csv_pre():
-    subprocess.call(['/usr/share/sisyphus-cli/helpers/make_local_csv_pre']) # this is really hard to do in python, so we cheat with a bash helper script
-
-def generate_sisyphus_local_packages_table_csv_post():
-    subprocess.call(['/usr/share/sisyphus-cli/helpers/make_local_csv_post']) # this is really hard to do in python, so we cheat with a bash helper script
-
-def sync_sisyphus_local_packages_table_csv():
-    if filecmp.cmp(sisyphus_local_csv_path_pre, sisyphus_local_csv_path_post):
-        print("sisyphus database local_packages table is in sync with portage database, nothing to do...")
-    else:
-        print("sisyphus database local_packages table is not in sync with portage database, syncing now...")
-        sisyphusdb = sqlite3.connect(sisyphus_database_path)
-        sisyphusdb.cursor().execute('''drop table if exists local_packages''')
-        sisyphusdb.cursor().execute('''create table local_packages (category TEXT,name TEXT,version TEXT,slot TEXT,description TEXT)''')
-        with open(sisyphus_local_csv_path_post) as sisyphus_local_csv:
-            for row in csv.reader(sisyphus_local_csv):
-                sisyphusdb.cursor().execute("insert into local_packages (category, name, version, slot, description) values (?, ?, ?, ?, ?);", row)
-        sisyphusdb.commit()
-        sisyphusdb.close()
-    shutil.move(sisyphus_local_csv_path_post, sisyphus_local_csv_path_pre)
-
-def sisyphus_pkg_install():
-    check_sync()
-    generate_sisyphus_local_packages_table_csv_pre()
-    subprocess.call(['emerge', '-a'] + sys.argv[2:])
-    generate_sisyphus_local_packages_table_csv_post()
-    sync_sisyphus_local_packages_table_csv()
-
-def sisyphus_pkg_uninstall():
-    check_sync()
-    generate_sisyphus_local_packages_table_csv_pre()
-    subprocess.call(['emerge', '--depclean', '-a'] + sys.argv[2:])
-    generate_sisyphus_local_packages_table_csv_post()
-    sync_sisyphus_local_packages_table_csv()
-
-def sisyphus_pkg_force_uninstall():
-    check_sync()
-    generate_sisyphus_local_packages_table_csv_pre()
-    subprocess.call(['emerge', '--unmerge', '-a'] + sys.argv[2:])
-    generate_sisyphus_local_packages_table_csv_post()
-    sync_sisyphus_local_packages_table_csv()
-
-def sisyphus_pkg_remove_orphans():
-    check_sync()
-    generate_sisyphus_local_packages_table_csv_pre()
-    subprocess.call(['emerge', '--depclean', '-a'])
-    generate_sisyphus_local_packages_table_csv_post()
-    sync_sisyphus_local_packages_table_csv()
-
-def sisyphus_pkg_system_upgrade():
-    check_sync()
-    generate_sisyphus_local_packages_table_csv_pre()
-    subprocess.call(['emerge', '-uDaN', '--with-bdeps=y', '@world'])
-    generate_sisyphus_local_packages_table_csv_post()
-    sync_sisyphus_local_packages_table_csv()
-
-def sisyphus_pkg_auto_install():
-    redcore_sync()
-    generate_sisyphus_local_packages_table_csv_pre()
-    subprocess.call(['emerge'] + sys.argv[2:])
-    generate_sisyphus_local_packages_table_csv_post()
-    sync_sisyphus_local_packages_table_csv()
-
-def sisyphus_pkg_auto_uninstall():
-    redcore_sync()
-    generate_sisyphus_local_packages_table_csv_pre()
-    subprocess.call(['emerge', '--depclean'] + sys.argv[2:])
-    generate_sisyphus_local_packages_table_csv_post()
-    sync_sisyphus_local_packages_table_csv()
-
-def sisyphus_pkg_auto_force_uninstall():
-    redcore_sync()
-    generate_sisyphus_local_packages_table_csv_pre()
-    subprocess.call(['emerge', '--unmerge'] + sys.argv[2:])
-    generate_sisyphus_local_packages_table_csv_post()
-    sync_sisyphus_local_packages_table_csv()
-
-def sisyphus_pkg_auto_remove_orphans():
-    redcore_sync()
-    generate_sisyphus_local_packages_table_csv_pre()
-    subprocess.call(['emerge', '--depclean', '-q'])
-    generate_sisyphus_local_packages_table_csv_post()
-    sync_sisyphus_local_packages_table_csv()
-
-def sisyphus_pkg_auto_system_upgrade():
-    redcore_sync()
-    generate_sisyphus_local_packages_table_csv_pre()
-    subprocess.call(['emerge', '-uDN', '--with-bdeps=y', '@world'])
-    generate_sisyphus_local_packages_table_csv_post()
-    sync_sisyphus_local_packages_table_csv()
-
-def sisyphus_pkg_search():
-    subprocess.call(['emerge', '--search'] + sys.argv[2:])
-
-def sisyphus_pkg_system_update():
-    redcore_sync()
diff --git a/frontend/gui/Makefile b/frontend/gui/Makefile
deleted file mode 100644
index 67236e1..0000000
--- a/frontend/gui/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-SUBDIRS =
-DESTDIR = 
-UBINDIR ?= /usr/bin
-DESKTOPDIR ?= /usr/share/applications
-PIXMAPDIR ?= /usr/share/pixmaps
-SISYPHUSDATADIR ?= /usr/share/sisyphus-gui
-POLKITDIR ?= /usr/share/polkit-1/actions
-
-all:
-	for d in $(SUBDIRS); do $(MAKE) -C $$d; done
-
-clean:
-	for d in $(SUBDIRS); do $(MAKE) -C $$d clean; done
-
-install:
-	for d in $(SUBDIRS); do $(MAKE) -C $$d install; done
-
-	install -d $(DESTDIR)$(UBINDIR)
-	install -m 0755 sisyphus-gui $(DESTDIR)$(UBINDIR)/
-	install -m 0755 sisyphus-gui-pkexec $(DESTDIR)$(UBINDIR)/
-	install -d $(DESTDIR)$(SISYPHUSDATADIR)
-	install -d $(DESTDIR)$(SISYPHUSDATADIR)/icon
-	install -d $(DESTDIR)$(SISYPHUSDATADIR)/ui
-	install -m 0755 *.py $(DESTDIR)$(SISYPHUSDATADIR)/
-	install -m 0755 icon/* $(DESTDIR)$(SISYPHUSDATADIR)/icon/
-	install -m 0755 ui/* $(DESTDIR)$(SISYPHUSDATADIR)/ui/
-	install -d $(DESTDIR)$(DESKTOPDIR)
-	install -m 0755 desktop/sisyphus-gui.desktop $(DESTDIR)$(DESKTOPDIR)/
-	install -d $(DESTDIR)$(PIXMAPDIR)
-	install -m 0644 desktop/sisyphus-gui.png $(DESTDIR)$(PIXMAPDIR)
-	install -d $(DESTDIR)$(POLKITDIR)
-	install -m 0644 org.redcorelinux.sisyphus-gui.policy $(DESTDIR)$(POLKITDIR)/
-
-uninstall:
-	rm -rf $(DESTDIR)$(UBINDIR)/sisyphus-gui
-	rm -rf $(DESTDIR)$(UBINDIR)/sisyphus-gui-pkexec
-	rm -rf $(DESTDIR)$(DESKTOPDIR)/sisyphus-gui.desktop
-	rm -rf $(DESTDIR)$(PIXMAPDIR)/sisyphus-gui.png
-	rm -rf $(DESTDIR)$(POLKITDIR)/org.redcorelinux.sisyphus-gui.policy
-	rm -rf $(DESTDIR)$(SISYPHUSDATADIR)
diff --git a/frontend/gui/org.redcorelinux.sisyphus-gui.policy b/org.redcorelinux.sisyphus-gui.policy
index 811c348..811c348 100644
--- a/frontend/gui/org.redcorelinux.sisyphus-gui.policy
+++ b/org.redcorelinux.sisyphus-gui.policy
diff --git a/frontend/gui/sisyphus-gui b/sisyphus-gui
index 1e29d08..87254ec 100755
--- a/frontend/gui/sisyphus-gui
+++ b/sisyphus-gui
@@ -4,7 +4,7 @@
 # Main Author : Ghiunhan Mamut @ Redcore Linux Project
 
 main() {
-	pushd /usr/share/sisyphus-gui
+	pushd /usr/share/sisyphus
 	python3 sisyphus-gui.py
 	popd
 }
diff --git a/frontend/gui/sisyphus-gui-pkexec b/sisyphus-gui-pkexec
index 4a1b496..4a1b496 100755
--- a/frontend/gui/sisyphus-gui-pkexec
+++ b/sisyphus-gui-pkexec
diff --git a/frontend/gui/desktop/sisyphus-gui.desktop b/sisyphus-gui.desktop
index c4ff12b..c4ff12b 100755
--- a/frontend/gui/desktop/sisyphus-gui.desktop
+++ b/sisyphus-gui.desktop
diff --git a/frontend/gui/desktop/sisyphus-gui.png b/sisyphus-gui.png
index d36d93b..d36d93b 100644
--- a/frontend/gui/desktop/sisyphus-gui.png
+++ b/sisyphus-gui.png
diff --git a/backend/libsisyphus.sh b/src/backend/libsisyphus.sh
index 530f9bf..530f9bf 100755
--- a/backend/libsisyphus.sh
+++ b/src/backend/libsisyphus.sh
diff --git a/frontend/cli/sisyphus-cli.py b/src/frontend/cli/sisyphus-cli.py
index 3d4fb3a..3d4fb3a 100755
--- a/frontend/cli/sisyphus-cli.py
+++ b/src/frontend/cli/sisyphus-cli.py
diff --git a/frontend/cli/sisyphus-cli b/src/frontend/cli/sisyphus-cli.sh
index 79023aa..79023aa 100755
--- a/frontend/cli/sisyphus-cli
+++ b/src/frontend/cli/sisyphus-cli.sh
diff --git a/frontend/gui/accesories.py b/src/frontend/gui/accesories.py
index 32d3b68..32d3b68 100755
--- a/frontend/gui/accesories.py
+++ b/src/frontend/gui/accesories.py
diff --git a/frontend/gui/development.py b/src/frontend/gui/development.py
index ede83a4..ede83a4 100755
--- a/frontend/gui/development.py
+++ b/src/frontend/gui/development.py
diff --git a/frontend/gui/everything.py b/src/frontend/gui/everything.py
index ac83ca6..ac83ca6 100755
--- a/frontend/gui/everything.py
+++ b/src/frontend/gui/everything.py
diff --git a/frontend/gui/games.py b/src/frontend/gui/games.py
index 5eed9fa..5eed9fa 100755
--- a/frontend/gui/games.py
+++ b/src/frontend/gui/games.py
diff --git a/frontend/gui/graphics.py b/src/frontend/gui/graphics.py
index a50a169..a50a169 100755
--- a/frontend/gui/graphics.py
+++ b/src/frontend/gui/graphics.py
diff --git a/frontend/gui/icon/category_accessories.png b/src/frontend/gui/icon/category_accessories.png
index becbfc9..becbfc9 100644
--- a/frontend/gui/icon/category_accessories.png
+++ b/src/frontend/gui/icon/category_accessories.png
diff --git a/frontend/gui/icon/category_all.png b/src/frontend/gui/icon/category_all.png
index 462c97c..462c97c 100644
--- a/frontend/gui/icon/category_all.png
+++ b/src/frontend/gui/icon/category_all.png
diff --git a/frontend/gui/icon/category_development.png b/src/frontend/gui/icon/category_development.png
index b2c160e..b2c160e 100644
--- a/frontend/gui/icon/category_development.png
+++ b/src/frontend/gui/icon/category_development.png
diff --git a/frontend/gui/icon/category_games.png b/src/frontend/gui/icon/category_games.png
index b128490..b128490 100644
--- a/frontend/gui/icon/category_games.png
+++ b/src/frontend/gui/icon/category_games.png
diff --git a/frontend/gui/icon/category_graphics.png b/src/frontend/gui/icon/category_graphics.png
index 63c7c5e..63c7c5e 100644
--- a/frontend/gui/icon/category_graphics.png
+++ b/src/frontend/gui/icon/category_graphics.png
diff --git a/frontend/gui/icon/category_internet.png b/src/frontend/gui/icon/category_internet.png
index 9f630cd..9f630cd 100644
--- a/frontend/gui/icon/category_internet.png
+++ b/src/frontend/gui/icon/category_internet.png
diff --git a/frontend/gui/icon/category_local.png b/src/frontend/gui/icon/category_local.png
index 561d218..561d218 100644
--- a/frontend/gui/icon/category_local.png
+++ b/src/frontend/gui/icon/category_local.png
diff --git a/frontend/gui/icon/category_multimedia.png b/src/frontend/gui/icon/category_multimedia.png
index e6414e6..e6414e6 100644
--- a/frontend/gui/icon/category_multimedia.png
+++ b/src/frontend/gui/icon/category_multimedia.png
diff --git a/frontend/gui/icon/category_office.png b/src/frontend/gui/icon/category_office.png
index 78af8a4..78af8a4 100644
--- a/frontend/gui/icon/category_office.png
+++ b/src/frontend/gui/icon/category_office.png
diff --git a/frontend/gui/icon/category_system.png b/src/frontend/gui/icon/category_system.png
index 2a360bd..2a360bd 100644
--- a/frontend/gui/icon/category_system.png
+++ b/src/frontend/gui/icon/category_system.png
diff --git a/frontend/gui/icon/package_install.png b/src/frontend/gui/icon/package_install.png
index 736cddf..736cddf 100644
--- a/frontend/gui/icon/package_install.png
+++ b/src/frontend/gui/icon/package_install.png
diff --git a/frontend/gui/icon/package_search.png b/src/frontend/gui/icon/package_search.png
index 5f50a53..5f50a53 100644
--- a/frontend/gui/icon/package_search.png
+++ b/src/frontend/gui/icon/package_search.png
diff --git a/frontend/gui/icon/package_uninstall.png b/src/frontend/gui/icon/package_uninstall.png
index 187ce04..187ce04 100644
--- a/frontend/gui/icon/package_uninstall.png
+++ b/src/frontend/gui/icon/package_uninstall.png
diff --git a/frontend/gui/icon/remove_orphans.png b/src/frontend/gui/icon/remove_orphans.png
index b165bf7..b165bf7 100644
--- a/frontend/gui/icon/remove_orphans.png
+++ b/src/frontend/gui/icon/remove_orphans.png
diff --git a/frontend/gui/icon/system_upgrade.png b/src/frontend/gui/icon/system_upgrade.png
index 4443cb7..4443cb7 100644
--- a/frontend/gui/icon/system_upgrade.png
+++ b/src/frontend/gui/icon/system_upgrade.png
diff --git a/frontend/gui/icon/window_close.png b/src/frontend/gui/icon/window_close.png
index 35dbf35..35dbf35 100644
--- a/frontend/gui/icon/window_close.png
+++ b/src/frontend/gui/icon/window_close.png
diff --git a/frontend/gui/icon/window_icon.png b/src/frontend/gui/icon/window_icon.png
index da169ba..da169ba 100644
--- a/frontend/gui/icon/window_icon.png
+++ b/src/frontend/gui/icon/window_icon.png
diff --git a/frontend/gui/internet.py b/src/frontend/gui/internet.py
index e8ad1d3..e8ad1d3 100755
--- a/frontend/gui/internet.py
+++ b/src/frontend/gui/internet.py
diff --git a/frontend/gui/local.py b/src/frontend/gui/local.py
index e8b506a..e8b506a 100755
--- a/frontend/gui/local.py
+++ b/src/frontend/gui/local.py
diff --git a/frontend/gui/multimedia.py b/src/frontend/gui/multimedia.py
index e4214f2..e4214f2 100755
--- a/frontend/gui/multimedia.py
+++ b/src/frontend/gui/multimedia.py
diff --git a/frontend/gui/office.py b/src/frontend/gui/office.py
index 286494a..286494a 100755
--- a/frontend/gui/office.py
+++ b/src/frontend/gui/office.py
diff --git a/frontend/gui/sisyphus-gui.py b/src/frontend/gui/sisyphus-gui.py
index 1cc4fb6..1cc4fb6 100755
--- a/frontend/gui/sisyphus-gui.py
+++ b/src/frontend/gui/sisyphus-gui.py
diff --git a/frontend/gui/system.py b/src/frontend/gui/system.py
index f8cc428..f8cc428 100755
--- a/frontend/gui/system.py
+++ b/src/frontend/gui/system.py
diff --git a/frontend/gui/ui/accesories.ui b/src/frontend/gui/ui/accesories.ui
index ea9e495..ea9e495 100644
--- a/frontend/gui/ui/accesories.ui
+++ b/src/frontend/gui/ui/accesories.ui
diff --git a/frontend/gui/ui/development.ui b/src/frontend/gui/ui/development.ui
index 4c102f1..4c102f1 100644
--- a/frontend/gui/ui/development.ui
+++ b/src/frontend/gui/ui/development.ui
diff --git a/frontend/gui/ui/everything.ui b/src/frontend/gui/ui/everything.ui
index b609cee..b609cee 100644
--- a/frontend/gui/ui/everything.ui
+++ b/src/frontend/gui/ui/everything.ui
diff --git a/frontend/gui/ui/games.ui b/src/frontend/gui/ui/games.ui
index 0bbc787..0bbc787 100644
--- a/frontend/gui/ui/games.ui
+++ b/src/frontend/gui/ui/games.ui
diff --git a/frontend/gui/ui/graphics.ui b/src/frontend/gui/ui/graphics.ui
index e943b49..e943b49 100644
--- a/frontend/gui/ui/graphics.ui
+++ b/src/frontend/gui/ui/graphics.ui
diff --git a/frontend/gui/ui/internet.ui b/src/frontend/gui/ui/internet.ui
index 810c065..810c065 100644
--- a/frontend/gui/ui/internet.ui
+++ b/src/frontend/gui/ui/internet.ui
diff --git a/frontend/gui/ui/local.ui b/src/frontend/gui/ui/local.ui
index 46cd6f9..46cd6f9 100644
--- a/frontend/gui/ui/local.ui
+++ b/src/frontend/gui/ui/local.ui
diff --git a/frontend/gui/ui/multimedia.ui b/src/frontend/gui/ui/multimedia.ui
index b2c4938..b2c4938 100644
--- a/frontend/gui/ui/multimedia.ui
+++ b/src/frontend/gui/ui/multimedia.ui
diff --git a/frontend/gui/ui/office.ui b/src/frontend/gui/ui/office.ui
index d1d3bad..d1d3bad 100644
--- a/frontend/gui/ui/office.ui
+++ b/src/frontend/gui/ui/office.ui
diff --git a/frontend/gui/ui/sisyphus-gui.ui b/src/frontend/gui/ui/sisyphus-gui.ui
index 0d6749c..0d6749c 100644
--- a/frontend/gui/ui/sisyphus-gui.ui
+++ b/src/frontend/gui/ui/sisyphus-gui.ui
diff --git a/frontend/gui/ui/system.ui b/src/frontend/gui/ui/system.ui
index 59f1967..59f1967 100644
--- a/frontend/gui/ui/system.ui
+++ b/src/frontend/gui/ui/system.ui
diff --git a/helpers/make_local_csv_post b/src/helpers/make_local_csv_post
index cd38974..cd38974 100755
--- a/helpers/make_local_csv_post
+++ b/src/helpers/make_local_csv_post
diff --git a/helpers/make_local_csv_pre b/src/helpers/make_local_csv_pre
index 068331e..068331e 100755
--- a/helpers/make_local_csv_pre
+++ b/src/helpers/make_local_csv_pre