Allow packaging without version number

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index c9f3ab7f1b8c35a3147cbfc4daa41b0e62eaf03f..899539a0f190e48e1aba8fd4a2ef3453bddc4ed9 100644 (file)
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -10,10 +10,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
       - name: Package
-        run: python3 make_release.py 10.0.1
+        run: python3 make_release.py
       - name: Upload
         uses: actions/upload-artifact@v2
         with: 
           name: plugin
           path: |
             DeDRM_tools_*.zip
+            DeDRM_tools.zip

diff --git a/make_release.py b/make_release.py
index 0e95173d27687004a71e7711e9f86d60086ac71c..e600af8a42761cbce8079b4ca0e0e52357f3a5d6 100755 (executable)
--- a/make_release.py
+++ b/make_release.py
@@ -34,7 +34,10 @@ def make_release(version):
     shutil.copy(OBOK_README, RELEASE_DIR)
     shutil.copy("ReadMe_Overview.txt", RELEASE_DIR)
 
-    release_name = 'DeDRM_tools_{}'.format(version)
+    if version is not None:
+        release_name = 'DeDRM_tools_{}'.format(version)
+    else:
+        release_name = 'DeDRM_tools'
     result = shutil.make_archive(release_name, 'zip', RELEASE_DIR)
     try:
         shutil.rmtree(RELEASE_DIR)
@@ -48,6 +51,6 @@ if __name__ == '__main__':
     try:
         version = sys.argv[1]
     except IndexError:
-        raise SystemExit('Usage: {} version'.format(__file__))
+        version = None
 
     print(make_release(version))