Merge pull request #88 from SummerGGift/fix_linux_pkg_bug

【同步】：develop 分支

Author: armink

archive.py

@@ -27,19 +27,29 @@
 import zipfile
 import os
 import pkgsdb
+import platform
+import shutil
 
 
 def unpack(archive_fn, path, pkg, pkgs_name_in_json):
     pkg_ver = pkg['ver']
     flag = True
 
+    iswindows = False
+
+    if platform.system() == "Windows":
+        iswindows = True
+
     if ".tar.bz2" in archive_fn:
         arch = tarfile.open(archive_fn, "r:bz2")
         for tarinfo in arch:
             arch.extract(tarinfo, path)
             a = tarinfo.name
             if not os.path.isdir(os.path.join(path, a)):
-                right_path = a.replace('/', '\\')
+                if iswindows:
+                    right_path = a.replace('/', '\\')
+                else:
+                    right_path = a
                 a = os.path.join(os.path.split(right_path)[0], os.path.split(right_path)[1])
                 pkgsdb.savetodb(a, archive_fn)
         arch.close()
@@ -50,7 +60,10 @@ def unpack(archive_fn, path, pkg, pkgs_name_in_json):
             arch.extract(tarinfo, path)
             a = tarinfo.name
             if not os.path.isdir(os.path.join(path, a)):
-                right_path = a.replace('/', '\\')
+                if iswindows:
+                    right_path = a.replace('/', '\\')
+                else:
+                    right_path = a
                 a = os.path.join(os.path.split(right_path)[0], os.path.split(right_path)[1])
                 pkgsdb.savetodb(a, archive_fn)
         arch.close()
@@ -60,7 +73,11 @@ def unpack(archive_fn, path, pkg, pkgs_name_in_json):
         for item in arch.namelist():
             arch.extract(item, path)
             if not os.path.isdir(os.path.join(path, item)):
-                right_path = item.replace('/', '\\')
+                if iswindows:
+                    right_path = item.replace('/', '\\')
+                else:
+                    right_path = item
+
                 # Gets the folder name and change_dirname only once
                 if flag:
                     dir_name = os.path.split(right_path)[0]
@@ -72,12 +89,14 @@ def unpack(archive_fn, path, pkg, pkgs_name_in_json):
         arch.close()
 
     # Change the folder name
-    
     change_dirname = pkgs_name_in_json + '-' + pkg_ver
 
     if os.path.isdir(os.path.join(path, change_dirname)):
-        cmd = 'rd /s /q ' + os.path.join(path, change_dirname)
-        os.system(cmd)
+        if iswindows:
+            cmd = 'rd /s /q ' + os.path.join(path, change_dirname)
+            os.system(cmd)
+        else:
+            shutil.rmtree(os.path.join(path, change_dirname))
 
     os.rename(os.path.join(path, dir_name),os.path.join(path, change_dirname)) 
 

cmds/cmd_package.py

@@ -671,7 +671,12 @@ def get_package_remove_path(pkg, bsp_packages_path):
     ver = pkg['ver']
     if dirpath[0] == '/' or dirpath[0] == '\\':
         dirpath = dirpath[1:]
-    dirpath = os.path.basename(dirpath.replace('/', '\\'))
+
+    if platform.system() == "Windows":
+        dirpath = os.path.basename(dirpath.replace('/', '\\'))
+    else:
+        dirpath = os.path.basename(dirpath)
+
     removepath = os.path.join(bsp_packages_path, dirpath)
 
     # Handles the deletion of git repository folders with version Numbers
@@ -898,15 +903,15 @@ def package_wizard():
 
     #third step
     packageclass = ('iot', 'language', 'misc', 'multimedia',
-                    'peripherals', 'security', 'system', 'tools')
-    print ('\033[5;33;40m\n3.Please choose a package category from 1 to 8 : \033[0m')
-    print ("\033[1;32;40m[1:iot]|[2:language]|[3:misc]|[4:multimedia]|[5:peripherals]|[6:security]|[7:system]|[8:tools]\033[0m")
+                    'peripherals', 'security', 'system', 'tools', 'peripherals/sensors')
+    print ('\033[5;33;40m\n3.Please choose a package category from 1 to 9 : \033[0m')
+    print ("\033[1;32;40m[1:iot]|[2:language]|[3:misc]|[4:multimedia]|[5:peripherals]|[6:security]|[7:system]|[8:tools]|[9:sensors]\033[0m")
     classnu = raw_input()
-    while classnu == '' or classnu.isdigit()== False or int(classnu) < 1 or int(classnu) >8:
+    while classnu == '' or classnu.isdigit()== False or int(classnu) < 1 or int(classnu) >9:
         if classnu == '' :
             print ('\033[1;31;40mError: You must choose a package category. Try again.\033[0m')
         else :    
-            print ('\033[1;31;40mError: You must input an integer number from 1 to 8. Try again.\033[0m')
+            print ('\033[1;31;40mError: You must input an integer number from 1 to 9. Try again.\033[0m')
         classnu = raw_input()
 
     pkgsclass = packageclass[int(classnu) - 1]