make available options more ... intuitive

12 files changed, 50 insertions, 50 deletions

diff --git a/frontend/cli/sisyphus-cli b/frontend/cli/sisyphus-cli
index 18a5bb8..79023aa 100755
--- a/frontend/cli/sisyphus-cli
+++ b/frontend/cli/sisyphus-cli
@@ -14,19 +14,19 @@ case "$action" in
 		emerge -a "$@"
 		updatelocaldb
 		;;
-	remove)
+	uninstall)
 		checksync
 		localdbcsvpre
 		emerge --depclean -a "$@"
 		updatelocaldb
 		;;
-	forceremove)
+	force-uninstall)
 		checksync
 		localdbcsvpre
 		emerge --unmerge -a "$@"
 		updatelocaldb
 		;;
-	clean)
+	remove-orphans)
 		checksync
 		localdbcsvpre
 		emerge --depclean -a
@@ -38,31 +38,31 @@ case "$action" in
 		emerge -uDaN --with-bdeps=y @system @world "$@"
 		updatelocaldb
 		;;
-	autoinstall)
+	auto-install)
 		redcoresync
 		localdbcsvpre
 		emerge "$@"
 		updatelocaldb
 		;;
-	autoremove)
+	auto-uninstall)
 		redcoresync
 		localdbcsvpre
 		emerge --depclean "$@"
 		updatelocaldb
 		;;
-	autoforceremove)
+	auto-force-uninstall)
 		redcoresync
 		localdbcsvpre
 		emerge --unmerge "$@"
 		updatelocaldb
 		;;
-	autoclean)
+	auto-remove-orphans)
 		redcoresync
 		localdbcsvpre
 		emerge --depclean -q
 		updatelocaldb
 		;;
-	autoupgrade)
+	auto-upgrade)
 		redcoresync
 		localdbcsvpre
 		emerge -uDN --with-bdeps=y @system @world "$@"
@@ -96,19 +96,19 @@ case "$action" in
 
 			Commands :
 				install - Install new packages
-				remove - Remove packages safely
-				forceremove - *Unsafely* remove packages
-				clean - Remove packages that are no longer needed
+				uninstall - Uninstall packages safely
+				force-uninstall - *Unsafely* uninstall packages
+				remove-orphans - Uninstall packages that are no longer needed
 				upgrade -  Upgrade system
-				autoinstall - Install new packages (no confirmation)
-				autoremove - Remove packages safely (no confirmation)
-				autoforceremove - *Unsafely* remove packages (no confirmation)
-				autoclean - Remove packages that are no longer needed (no confirmation)
-				autoupgrade - Upgrade system (no confirmation)
+				auto-install - Install new packages (no confirmation)
+				auto-uninstall - Uninstall packages safely (no confirmation)
+				auto-force-uninstall - *Unsafely* uninstall packages (no confirmation)
+				auto-remove-orphans - Uninstall packages that are no longer needed (no confirmation)
+				auto-upgrade - Upgrade system (no confirmation)
 				search - Search for packages
 				update - Resync portage tree, portage config && redcore overlay
 				belongs - List what package FILE(s) belong to
-				depends - List all packages directly depending on ATOM
+				depends - List all packages directly depending on given package
 				files - List all files installed by package
 				sysinfo - Display information about installed core packages and portage configuration
 		EOH
diff --git a/frontend/gui/accesories.py b/frontend/gui/accesories.py
index 530886f..32d3b68 100755
--- a/frontend/gui/accesories.py
+++ b/frontend/gui/accesories.py
@@ -22,14 +22,14 @@ class Accesories(QtWidgets.QMainWindow):
    
     def install_package(self):
         pkgname = self.table_accesories.item(self.table_accesories.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoinstall'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-install'] + pkgname.split())
  
     def uninstall_package(self):
         pkgname = self.table_accesories.item(self.table_accesories.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'] + pkgname.split())
 
     def remove_orphans(self):
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoclean'])        
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'remove-orphans'])
 
     def exit_category(self):
         self.close()
diff --git a/frontend/gui/development.py b/frontend/gui/development.py
index 0f1221f..ede83a4 100755
--- a/frontend/gui/development.py
+++ b/frontend/gui/development.py
@@ -22,14 +22,14 @@ class Development(QtWidgets.QMainWindow):
 
     def install_package(self):
         pkgname = self.table_development.item(self.table_development.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoinstall'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-install'] + pkgname.split())
     
     def uninstall_package(self):
         pkgname = self.table_development.item(self.table_development.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'] + pkgname.split())
 
     def remove_orphans(self):
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'])
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'])
 
     def exit_category(self):
         self.close()
diff --git a/frontend/gui/everything.py b/frontend/gui/everything.py
index e6b874b..ac83ca6 100755
--- a/frontend/gui/everything.py
+++ b/frontend/gui/everything.py
@@ -22,14 +22,14 @@ class Everything(QtWidgets.QMainWindow):
     
     def install_package(self):
         pkgname = self.table_everything.item(self.table_everything.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoinstall'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-install'] + pkgname.split())
 
     def uninstall_package(self):
         pkgname = self.table_everything.item(self.table_everything.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'] + pkgname.split())
 
     def remove_orphans(self):
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoclean'])
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'remove-orphans'])
 
     def exit_category(self):
         self.close()
diff --git a/frontend/gui/games.py b/frontend/gui/games.py
index 052e606..3fa78aa 100755
--- a/frontend/gui/games.py
+++ b/frontend/gui/games.py
@@ -22,14 +22,14 @@ class Games(QtWidgets.QMainWindow):
 
     def install_package(self):
         pkgname = self.table_games.item(self.table_games.currentRow(), 1).text()  
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoinstall'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-install'] + pkgname.split())
 
     def uninstall_package(self):
         pkgname = self.table_games.item(self.table_games.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'] + pkgname.split())
 
     def remove_orphans(self):
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoclean'])
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'remove-orphans'])
 
     def exit_category(self):
         self.close()
diff --git a/frontend/gui/graphics.py b/frontend/gui/graphics.py
index 270b8cf..a50a169 100755
--- a/frontend/gui/graphics.py
+++ b/frontend/gui/graphics.py
@@ -22,14 +22,14 @@ class Graphics(QtWidgets.QMainWindow):
 
     def install_package(self):
         pkgname = self.table_graphics.item(self.table_graphics.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoinstall'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-install'] + pkgname.split())
     
     def uninstall_package(self):
         pkgname = self.table_graphics.item(self.table_graphics.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'] + pkgname.split())
 
     def remove_orphans(self):
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoclean'])
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'remove-orphans'])
 
     def exit_category(self):
         self.close()
diff --git a/frontend/gui/internet.py b/frontend/gui/internet.py
index c7c7400..e8ad1d3 100755
--- a/frontend/gui/internet.py
+++ b/frontend/gui/internet.py
@@ -22,14 +22,14 @@ class Internet(QtWidgets.QMainWindow):
 
     def install_package(self):
         pkgname = self.table_internet.item(self.table_internet.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoinstall'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-install'] + pkgname.split())
     
     def uninstall_package(self):
         pkgname = self.table_internet.item(self.table_internet.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'] + pkgname.split())
 
     def remove_orphans(self):
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoclean'])
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'remove-orphans'])
 
     def exit_category(self):
         self.close()
diff --git a/frontend/gui/local.py b/frontend/gui/local.py
index 60c835a..e8b506a 100755
--- a/frontend/gui/local.py
+++ b/frontend/gui/local.py
@@ -22,14 +22,14 @@ class Local(QtWidgets.QMainWindow):
     
     def install_package(self):
         pkgname = self.table_local.item(self.table_local.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoinstall'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-install'] + pkgname.split())
 
     def uninstall_package(self):
         pkgname = self.table_local.item(self.table_local.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'] + pkgname.split())
 
     def remove_orphans(self):
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoclean'])
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'remove-orphans'])
 
     def exit_category(self):
         self.close()
diff --git a/frontend/gui/multimedia.py b/frontend/gui/multimedia.py
index 48d9bfb..e4214f2 100755
--- a/frontend/gui/multimedia.py
+++ b/frontend/gui/multimedia.py
@@ -22,14 +22,14 @@ class Multimedia(QtWidgets.QMainWindow):
 
     def install_package(self):
         pkgname = self.table_multimedia.item(self.table_multimedia.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoinstall'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-install'] + pkgname.split())
     
     def uninstall_package(self):
         pkgname = self.table_multimedia.item(self.table_multimedia.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'] + pkgname.split())
 
     def remove_orphans(self):
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoclean'])
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'remove-orphans'])
 
     def exit_category(self):
         self.close()
diff --git a/frontend/gui/office.py b/frontend/gui/office.py
index e030486..286494a 100755
--- a/frontend/gui/office.py
+++ b/frontend/gui/office.py
@@ -22,14 +22,14 @@ class Office(QtWidgets.QMainWindow):
 
     def install_package(self):
         pkgname = self.table_office.item(self.table_office.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoinstall'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-install'] + pkgname.split())
     
     def uninstall_package(self):
         pkgname = self.table_office.item(self.table_office.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'] + pkgname.split())
 
     def remove_orphans(self):
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoclean'])
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'remove-orphans'])
 
     def exit_category(self):
         self.close()
diff --git a/frontend/gui/sisyphus-gui.py b/frontend/gui/sisyphus-gui.py
index 244a9af..1cc4fb6 100755
--- a/frontend/gui/sisyphus-gui.py
+++ b/frontend/gui/sisyphus-gui.py
@@ -48,17 +48,17 @@ class Sisyphus(QtWidgets.QMainWindow):
 
     def install_package(self):
         pkgname = self.input.text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoinstall'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-install'] + pkgname.split())
 
     def uninstall_package(self):
         pkgname = self.input.text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'] + pkgname.split())
 
     def upgrade_system(self):
         subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoupgrade'])
 
     def remove_orphans(self):
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoclean'])
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'remove-orphans'])
 
     def accesories_category(self):
         self.window = Accesories()
diff --git a/frontend/gui/system.py b/frontend/gui/system.py
index c9942e0..f8cc428 100755
--- a/frontend/gui/system.py
+++ b/frontend/gui/system.py
@@ -22,14 +22,14 @@ class System(QtWidgets.QMainWindow):
 
     def install_package(self):
         pkgname = self.table_system.item(self.table_system.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoinstall'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-install'] + pkgname.split())
     
     def uninstall_package(self):
         pkgname = self.table_system.item(self.table_system.currentRow(), 1).text()
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoremove'] + pkgname.split())
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'auto-uninstall'] + pkgname.split())
 
     def remove_orphans(self):
-        subprocess.Popen(['xterm', '-e', 'sisyphus', 'autoclean'])
+        subprocess.Popen(['xterm', '-e', 'sisyphus', 'remove-orphans'])
 
     def exit_category(self):
         self.close()