Merge pull request #63 from McCloudS/McCloudS-patch-1

Move subgen.py to root directory and update associated file pointers.

.github/workflows/calver.yml

@@ -28,7 +28,7 @@ jobs:
           version_prefix: ''
       - name: Update version file
         run: |
-          sed -i "s/subgen_version =.*/subgen_version = '${{ steps.setcalver.outputs.package_version }}'/" subgen/subgen.py
+          sed -i "s/subgen_version =.*/subgen_version = '${{ steps.setcalver.outputs.package_version }}'/" subgen.py
       
       - name: Commit and push changes
         run: |

Dockerfile

@@ -16,6 +16,6 @@ RUN apt-get update \
 ENV PYTHONUNBUFFERED=1
 
 ADD https://raw.githubusercontent.com/McCloudS/subgen/main/launcher.py /subgen/launcher.py
-ADD https://raw.githubusercontent.com/McCloudS/subgen/main/subgen/subgen.py /subgen/subgen.py
+ADD https://raw.githubusercontent.com/McCloudS/subgen/main/subgen.py /subgen/subgen.py
 
 CMD [ "bash", "-c", "python3 -u launcher.py" ]

Dockerfile.cpu

@@ -16,6 +16,6 @@ RUN apt-get update \
 ENV PYTHONUNBUFFERED=1
 
 ADD https://raw.githubusercontent.com/McCloudS/subgen/main/launcher.py /subgen/launcher.py
-ADD https://raw.githubusercontent.com/McCloudS/subgen/main/subgen/subgen.py /subgen/subgen.py
+ADD https://raw.githubusercontent.com/McCloudS/subgen/main/subgen.py /subgen/subgen.py
 
 CMD [ "bash", "-c", "python3 -u launcher.py" ]

launcher.py

@@ -55,10 +55,10 @@ def main():
     
     if not os.path.exists(subgen_script_name):
         print(f"File {subgen_script_name} does not exist. Downloading from GitHub...")
-        download_from_github("https://raw.githubusercontent.com/McCloudS/subgen/main/subgen/subgen.py", subgen_script_name)
+        download_from_github("https://raw.githubusercontent.com/McCloudS/subgen/main/subgen.py", subgen_script_name)
     elif convert_to_bool(os.getenv("UPDATE", "False")) or args.update:
         print(f"File exists, but UPDATE is set to True. Downloading {subgen_script_name} from GitHub...")
-        download_from_github("https://raw.githubusercontent.com/McCloudS/subgen/main/subgen/subgen.py", subgen_script_name)
+        download_from_github("https://raw.githubusercontent.com/McCloudS/subgen/main/subgen.py", subgen_script_name)
     else:
         print("Environment variable UPDATE is not set or set to False, skipping download.")