Windows and Linux are now in 1 scripts

Will read OS from config.ini
Nitro4542 · May 28, 2023 · 150ad7c · 150ad7c
1 parent 086fc47
commit 150ad7c
Show file tree

Hide file tree

Showing 10 changed files with 25 additions and 252 deletions.
diff --git a/linux/scripts/config.ini b/linux/scripts/config.ini
diff --git a/linux/scripts/remove-mods.py b/linux/scripts/remove-mods.py
diff --git a/linux/scripts/backup-mods.py → scripts/backup-mods.py b/linux/scripts/backup-mods.py → scripts/backup-mods.py
@@ -46,7 +46,13 @@ def randomword(length):
 elif config.get('Paths','minecraft-mod-folder') != "default":
     src1 = config.get('Paths','minecraft-mod-folder')
 else:
-    src1 = os.getenv('HOME')+"/.minecraft/mods"
+    if config.get('General','operating-system') == "Windows":
+        src1 = os.getenv('APPDATA')+"\\.minecraft\\mods"
+    elif config.get('General','operating-system') == "Linux":
+        src1 = os.getenv('HOME')+"/.minecraft/mods"
+    else:
+        print('Please check your configuration at operating-system.')
+        quit()
 
 # Copy all content of mods folder into backup destination
 def create_backup(src):

diff --git a/windows/scripts/config.ini → scripts/config.ini b/windows/scripts/config.ini → scripts/config.ini
@@ -1,4 +1,7 @@
 [Paths]
 default-backup-path = NOT_SET
 minecraft-mod-folder = default
-cache-folder = NOT_SET
+cache-folder = NOT_SET
+
+[General]
+operating-system = Windows
diff --git a/linux/scripts/install-mods.py → scripts/install-mods.py b/linux/scripts/install-mods.py → scripts/install-mods.py
@@ -37,7 +37,13 @@ def install_mods(src):
     if config.get('Paths','minecraft-mod-folder') != "default":
         final_destination = config.get('Paths','minecraft-mod-folder')
     else:
-        final_destination = os.getenv('HOME')+"/.minecraft/mods"
+        if config.get('General','operating-system') == "Windows":
+            final_destination = os.getenv('APPDATA')+"\\.minecraft\\mods"
+        elif config.get('General','operating-system') == "Linux":
+            final_destination = os.getenv('HOME')+"/.minecraft/mods"
+        else:
+            print('Please check your configuration at operating-system.')
+            quit()
 
 # Copy all contents of selected folder into mods folder
     src_files = os.listdir(src)

diff --git a/linux/scripts/prepare-mod-pack.py → scripts/prepare-mod-pack.py b/linux/scripts/prepare-mod-pack.py → scripts/prepare-mod-pack.py
diff --git a/windows/scripts/remove-mods.py → scripts/remove-mods.py b/windows/scripts/remove-mods.py → scripts/remove-mods.py
@@ -30,7 +30,13 @@
 elif config.get('Paths','minecraft-mod-folder') != "default":
     folder = config.get('Paths','minecraft-mod-folder')
 else:
-    folder = os.getenv('APPDATA')+"\\.minecraft\\mods"
+    if config.get('General','operating-system') == "Windows":
+        folder = os.getenv('APPDATA')+"\\.minecraft\\mods"
+    elif config.get('General','operating-system') == "Linux":
+        folder = os.getenv('HOME')+"/.minecraft/mods"
+    else:
+        print('Please check your configuration at operating-system.')
+        quit()
 
 # Deletes all mods in mods folder
 def delete_mods():

diff --git a/windows/scripts/backup-mods.py b/windows/scripts/backup-mods.py
diff --git a/windows/scripts/install-mods.py b/windows/scripts/install-mods.py
diff --git a/windows/scripts/prepare-mod-pack.py b/windows/scripts/prepare-mod-pack.py