commit 3896733886f5687dc57a1887a78b386445f9e1fe
author Comran Morshed <comranmorsh@gmail.com> Sat Apr 23 19:26:48 2016 -0700
committer Comran Morshed <comranmorsh@gmail.com> Sun Apr 24 13:49:28 2016 -0700
tree 8dceca2b9dc16626f3c4090374f76a8460705b4e
parent daf692398556295106133cefa228b37d67152b00

Deploy www directory when deploying code and fix vision.

Change-Id: Ifd9fb09b655caaa064219efb6c13946937339849

aos/downloader/downloader.py

diff --git a/aos/downloader/downloader.py b/aos/downloader/downloader.py
index 5cdd94e..9799b1f 100644
--- a/aos/downloader/downloader.py
+++ b/aos/downloader/downloader.py
@@ -23,9 +23,19 @@
 
 
 def main(argv):
-  srcs = argv[1:argv.index('--')]
   args = argv[argv.index('--') + 1:]
 
+  relative_dir = ''
+  recursive = False
+
+  if '--dirs' in argv:
+    dirs_index = argv.index('--dirs')
+    srcs = argv[1:dirs_index]
+    relative_dir = argv[dirs_index + 1]
+    recursive = True
+  else:
+    srcs = argv[1:argv.index('--')]
+
   ROBORIO_TARGET_DIR = '/home/admin/robot_code'
   ROBORIO_USER = 'admin'
 
@@ -47,7 +57,7 @@
   ssh_target = '%s@%s' % (user, hostname)
 
   rsync_cmd = (['rsync', '-c', '-v', '-z', '--copy-links'] + srcs +
-               ['%s:%s' % (ssh_target, target_dir)])
+               ['%s:%s/%s' % (ssh_target, target_dir, relative_dir)])
   try:
     subprocess.check_call(rsync_cmd)
   except subprocess.CalledProcessError as e:
@@ -60,12 +70,13 @@
     else:
       raise e
 
-  subprocess.check_call(
-      ('ssh', ssh_target, '&&'.join([
-          'chmod u+s %s/starter_exe' % target_dir,
-          'echo \'Done moving new executables into place\'',
-          'bash -c \'sync && sync && sync\'',
-        ])))
+  if not recursive:
+    subprocess.check_call(
+        ('ssh', ssh_target, '&&'.join([
+            'chmod u+s %s/starter_exe' % target_dir,
+            'echo \'Done moving new executables into place\'',
+            'bash -c \'sync && sync && sync\'',
+          ])))
 
 if __name__ == '__main__':
   main(sys.argv)