Merge pull request #16 from pa-sowa/use-proper-downloads-directory

Use proper Downloads directory location
kubuntu-team · May 9, 2024 · b6e9f8a · b6e9f8a
2 parents 26e6dd3 + d104887
commit b6e9f8a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/KubuQA.conf b/KubuQA.conf
@@ -3,8 +3,8 @@
 
 
 # Directory the ISO file will be downloaded to.
-# Default: "$HOME/Downloads/KubuntuTestISO"
-ISO_DOWNLOAD_DIR="$HOME/Downloads/KubuntuTestISO"
+# Default is a XDG download dir, i.e. for English locale: "$HOME/Downloads/KubuntuTestISO"
+ISO_DOWNLOAD_DIR="$(xdg-user-dir DOWNLOAD)/KubuntuTestISO"
 
 # Name of the VM.
 # Default: "TestKubuntuInstall"

diff --git a/KubuQA.sh b/KubuQA.sh
@@ -11,8 +11,8 @@
 # You can also use flags or specify a config file via the '--config' flag. See './KubuQA.sh --help' for details.
 
 # Directory the ISO file will be downloaded to.
-# Default: "$HOME/Downloads/KubuntuTestISO"
-ISO_DOWNLOAD_DIR="$HOME/Downloads/KubuntuTestISO"
+# Default is a XDG download dir, i.e. for English locale: "$HOME/Downloads/KubuntuTestISO"
+ISO_DOWNLOAD_DIR="$(xdg-user-dir DOWNLOAD)/KubuntuTestISO"
 
 # Name of the VM.
 # Default: "TestKubuntuInstall"
@@ -70,7 +70,7 @@ usage() {
     echo "Options:"
     echo "  --config <path>             Path to a config file to source. If more command line options follow, they will overwrite the setting in the config file."
     echo "  -c, --cpu <cores>           Number of virtual CPUs to assign to the VM. Default: 2"
-    echo "  -i, --iso-dir <directory>   Directory to download the ISO file. Default: \"$HOME/Downloads/KubuntuTestISO\""
+    echo "  -i, --iso-dir <directory>   Directory to download the ISO file. Default: \"$(xdg-user-dir DOWNLOAD)/KubuntuTestISO\""
     echo "  -n, --vm-name <name>        Name of the Virtual Machine. Default: \"TestKubuntuInstall\""
     echo "  -v, --vdi-path <path>       Path to the Virtual Disk Image (VDI). Default: \"$HOME/VirtualBox VMs/<vm-name>/<vm-name>.vdi\""
     echo "  -r, --ram <MB>              Amount of host system RAM to allocate to the VM (in MB). Default: 2048 (2 GB)"