fix -install_remote, /usr/bin/warp unlink

Author: JustinTimperio

core/setup.py

@@ -59,14 +59,15 @@ def setup_warp(base_dir):
 
 def setup_warp_remote(ssh_alias, base_dir, dev):
     ### tunnel to a remote machine and install warp-cli
-    git_clone = ' "cd ' + base_dir + ' && git clone --recurse-submodules https://github.com/JustinTimperio/warp-cli.git &&'
-    build = ' python3 ' + base_dir + '/warp-cli/core/warp.py --install"' 
+    git_clone = 'git clone --recurse-submodules https://github.com/JustinTimperio/warp-cli.git ' + base_dir + '/warp-cli &&'
+    build = ' python3 ' + base_dir + '/warp-cli/core/warp.py --install' 
+    dev_switch = ' cd '+ base_dir + '/warp-cli/ && git checkout development && git submodule update --init --recursive && '
     if dev == False:
-        os.system('ssh ' + ssh_alias + git_clone + build)
+        os.system('ssh -t ' + ssh_alias +' "'+ git_clone + build +'"')
     if dev == True:
-        os.system('ssh ' + ssh_alias + git_clone + ' cd warp-cli/ && git checkout development && git submodule update --init --recursive &&' + build)
+        os.system('ssh -t ' + ssh_alias +' "'+ git_clone + dev_switch + build +'"')
 
 def uninstall_warp(base_dir):
     rm_dir(base_dir, sudo=True)
-    rm_file('/usr/bin/warp', sudo=True)
+    os.system('sudo rm /usr/bin/warp')
     print('Warp-CLI Uninstalled!')

core/warp.py

@@ -100,7 +100,7 @@ def start_recv_daemon(recv_path):
 ### install commands
 parser.add_argument("-in", "--install", action='store_true', help="Attempt an automated install of WDT and dependencies.")
 parser.add_argument("-ir", "--install_remote", nargs=2, metavar='SSH.ALIAS /DIR/TO/INSTALL', help="Attempt an automated install of WDT and dependencies on a remote machine.")
-parser.add_argument("-dev", "--dev_install", default=False, help="Install the Dev branch of Warp-CLI during a remote install. For Dev use only!")
+parser.add_argument("-dev", "--dev_install", action='store_true', help="Install the Dev branch of Warp-CLI during a remote install. For Dev use only!")
 parser.add_argument("-rm", "--uninstall", action='store_true', help="Remove Warp-CLI and config files.")
 
 ############
@@ -144,7 +144,7 @@ def start_recv_daemon(recv_path):
 
 if args.install_remote:
     from setup import *
-    setup_warp_remote(''.join(args.install_remote[:-1]), ''.join(args.install_remote[1:], arg.dev_install))
+    setup_warp_remote(''.join(args.install_remote[:-1]), ''.join(args.install_remote[1:]), args.dev_install)
 
 if args.uninstall == True:
     from setup import *