Create directories properly, zip correctly

SuperDisk · Dec 14, 2023 · e29e119 · e29e119
1 parent 73c998b
commit e29e119
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -195,7 +195,10 @@ jobs:
 
       - name: Zip files (preserving permissions)
         shell: bash
-        run: zip -r build.zip packaging/*
+        run: |
+          pushd packaging
+          zip -r ../build.zip .
+          popd
 
       - name: Store build
         uses: actions/upload-artifact@v2

diff --git a/src/hugesettings.pas b/src/hugesettings.pas
@@ -88,8 +88,8 @@ procedure InitializeTrackerSettings;
   if XDGCacheDir = '' then
     XDGCacheDir := ConcatPaths([GetUserDir, '.cache', 'hUGETracker']);
 
-  if not DirectoryExists(XDGConfigDir) then CreateDir(XDGConfigDir);
-  if not DirectoryExists(XDGCacheDir) then CreateDir(XDGCacheDir);
+  if not DirectoryExists(XDGConfigDir) then ForceDirectories(XDGConfigDir);
+  if not DirectoryExists(XDGCacheDir) then ForceDirectories(XDGCacheDir);
 
   SetupDirectoryParameter('conf_dir', XDGConfigDir, ConfDir);
   SetupDirectoryParameter('cache_dir', XDGCacheDir, CacheDir);
@@ -100,8 +100,8 @@ procedure InitializeTrackerSettings;
   MacConfigDir := ConcatPaths([GetUserDir, '.config', 'hUGETracker']);
   MacCacheDir := ConcatPaths([GetUserDir, '.cache', 'hUGETracker']);
 
-  if not DirectoryExists(MacConfigDir) then CreateDir(MacConfigDir);
-  if not DirectoryExists(MacCacheDir) then CreateDir(MacCacheDir);
+  if not DirectoryExists(MacConfigDir) then ForceDirectories(MacConfigDir);
+  if not DirectoryExists(MacCacheDir) then ForceDirectories(MacCacheDir);
 
   SetupDirectoryParameter('conf_dir', MacConfigDir, ConfDir);
   SetupDirectoryParameter('cache_dir', MacCacheDir, CacheDir);