small fix and changes on the CLI options

1 files changed, 9 insertions, 8 deletions

diff --git a/scripts/g-octave b/scripts/g-octave
index e6aa76e..09982bb 100755
--- a/scripts/g-octave
+++ b/scripts/g-octave
@@ -3,7 +3,8 @@
 
 import sys
 
-# This block ensures that ^C interrupts are handled quietly. From Portage
+# This block ensures that ^C interrupts are handled quietly.
+# Code snipet from Portage
 try:
     import signal
 
@@ -95,17 +96,17 @@ def main():
     )
     
     parser.add_option(
-        '-f', '--force',
+        '-f', '--force-all',
         action = 'store_true',
-        dest = 'force',
+        dest = 'force_all',
         default = False,
         help = 'forces the recreation of the overlay and of the ebuilds'
     )
     
     parser.add_option(
-        '--force-ebuilds',
+        '--force',
         action = 'store_true',
-        dest = 'force_ebuilds',
+        dest = 'force',
         default = False,
         help = 'forces the recreation of the ebuilds'
     )
@@ -176,10 +177,10 @@ can install only one package at once and his dependencies.""")
     
     # if we're alive yet, we have a package to install! :D
     
-    create_overlay(options.force)
+    create_overlay(options.force_all)
     
     try:
-        ebuild = Ebuild(args[0], options.force or options.force_ebuilds)
+        ebuild = Ebuild(args[0], options.force or options.force_all)
     except EbuildException:
         print >> sys.stderr, light_red('Package not found:'), white(args[0])
         sys.exit(1)
@@ -254,7 +255,7 @@ if __name__ == '__main__':
         sys.exit(1)
     except KeyError, error:
         print >> sys.stderr, light_blue('Key error'), '-', light_red(error)
-        print >> sys.stderr, white('Probably you have more than one overlay configured use with g-octave')
+        print >> sys.stderr, white('Probably you have more than one overlay configured to use with g-octave')
         print >> sys.stderr, white('Try remove the oldest and maintain only the overlay actually in use.')
         sys.exit(1)
     except Exception, error: