- Install script will not run if PyRadaio already installed.

- Update / Uiinstall will not run if PyRadio installed from distro or
  pip

Author: s-n-g

pyradio/install.py

@@ -160,7 +160,7 @@ def _no_download_method(self):
 
     def _do_it(self, mode='update'):
         ''' do I have git installed? '''
-        if subprocess.call('git --version 2>/dev/null 1>&2' ,shell=True) == 0:
+        if subprocess.call('git --version 2>/dev/null 1>&2', shell=True) == 0:
             self.git_found = True
         else:
             self.git_found = False
@@ -424,6 +424,10 @@ def _do_it(self, mode='update'):
 
     ''' Installation!!! '''
     if platform.system().lower().startswith('win'):
+        ret = subprocess.call('pyradio -h 1>NUL 2>NUL', shell=True)
+        if ret == 0:
+            print('PyRadio is already installed.\n')
+            sys.exit(1)
         subprocess.call('pip install windows-curses --upgrade')
         subprocess.call('pip install pywin32 --upgrade')
         subprocess.call('pip install requests --upgrade')
@@ -438,6 +442,10 @@ def _do_it(self, mode='update'):
         print('and the file:')
         print('    "{}"'.format(__file__))
     else:
+        ret = subprocess.call('pyradio -h 1>/dev/null 2>&1', shell=True)
+        if ret == 0:
+            print('PyRadio is already installed.\n')
+            sys.exit(1)
         uni = PyRadioUpdate()
         uni.install = True
         uni.update_pyradio()

pyradio/main.py

@@ -109,13 +109,21 @@ def shell():
     args = parser.parse_args()
     sys.stdout.flush()
 
+    config_already_read = False
+
     with pyradio_config_file() as pyradio_config:
 
-        if args.update or args.sng_master or args.sng_devel:
+        if args.uninstall or args.update or \
+                args.sng_master or args.sng_devel:
+            if not config_already_read:
+                read_config(pyradio_config)
+                config_already_read = True
             if pyradio_config.distro != 'None' and \
                     not platform.startswith('win'):
-                no_update()
+                no_update(args.uninstall)
+            sys.exit()
 
+        if args.update or args.sng_master or args.sng_devel:
             package = 0
             if args.sng_master:
                 package = 1
@@ -227,13 +235,9 @@ def shell():
 
         if args.list is False and args.add is False:
             print('Reading config...')
-        ret = pyradio_config.read_config()
-        if ret == -1:
-            print('Error opening config: "{}"'.format(pyradio_config.config_file))
-            sys.exit(1)
-        elif ret == -2:
-            print('Config file is malformed: "{}"'.format(pyradio_config.config_file))
-            sys.exit(1)
+        if not config_already_read:
+            read_config(pyradio_config)
+            config_already_read = True
 
         if args.use_player != '':
             requested_player = args.use_player
@@ -356,8 +360,18 @@ def shell():
         else:
             print('\nThis terminal can not display colors.\nPyRadio cannot function in such a terminal.\n')
 
-def no_update(action='update'):
-    print('PyRadio has been installed using your distribution\'s package manager.\nPlease use that to {} it.\n'.format(action))
+def read_config(pyradio_config):
+    ret = pyradio_config.read_config()
+    if ret == -1:
+        print('Error opening config: "{}"'.format(pyradio_config.config_file))
+        sys.exit(1)
+    elif ret == -2:
+        print('Config file is malformed: "{}"'.format(pyradio_config.config_file))
+        sys.exit(1)
+
+def no_update(uninstall):
+    action = 'uninstall' if uninstall else 'update'
+    print('PyRadio has been installed using either pip or your distribution\'s\npackage manager. Please use that to {} it.\n'.format(action))
     sys.exit(1)
 
 def print_playlist_selection_error(a_selection, cnf, ret, exit_if_malformed=True):