Bump to 2.2.4.2 (#36)

Remove any number of trailing '/' from zip dir spec
FNNDSC · Jul 20, 2020 · bd3eb94 · bd3eb94
1 parent c93a507
commit bd3eb94
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/README.rst b/README.rst
@@ -1,5 +1,5 @@
 ##################
-pfurl - v2.2.4.0
+pfurl - v2.2.4.2
 ##################
 
 .. image:: https://badge.fury.io/py/pfurl.svg

diff --git a/bin/pfurl b/bin/pfurl
@@ -24,7 +24,7 @@ str_defIP   = [l for l in ([ip for ip in socket.gethostbyname_ex(socket.gethostn
 str_defPort = '5055'
 
 str_name    = 'pfurl'
-str_version = "2.2.4.0"
+str_version = "2.2.4.2"
 str_desc    = Colors.CYAN + """
 
         __            _

diff --git a/pfurl/pfurl.py b/pfurl/pfurl.py
@@ -1171,8 +1171,9 @@ def zip_perform():
                 # Here we append a trailing '/' to the dirname so that the zip
                 # operation zips the contents and not the parent dir. Note though
                 # that we should only append the '/' if it is not already present!
-                if str_localPath[-1] != '/':
-                    str_dirSuffix   = '/'
+                while str_localPath[-1] == '/':
+                    str_localPath = str_localPath[0:-1]
+                str_dirSuffix   = '/'
             else:
                 self.dp.qprint("target is a file", level = 1, comms ='status')
 

diff --git a/setup.py b/setup.py
@@ -12,7 +12,7 @@ def readme():
 
 setup(
       name             =   'pfurl',
-      version          =   '2.2.4.0',
+      version          =   '2.2.4.2',
       description      =   '(Python) Path-File URL comms',
       long_description =   readme(),
       author           =   'Rudolph Pienaar',