Merge branch 'master' of git://github.com/quickemu-project/quickemu into quickemu-project-master

.editorconfig

@@ -0,0 +1,20 @@
+root = true
+
+[quickemu]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[quickget]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false

README.md

@@ -220,7 +220,11 @@ Other Operating Systems
 -   `cachyos` (CachyOS)
 -   `debian` (Debian)
 -   `devuan` (Devuan)
+<<<<<<< HEAD
 -   `dragonflybsd` (DragonFlyBSD)
+=======
+    `dragonflybsd` (DragonFlyBSD)
+>>>>>>> 22e95b4e74efdf48f3413b6f6a58232bd9fdaf3d
 -   `elementary` (elementary OS)
 -   `fedora` (Fedora)
 -   `freebsd` (FreeBSD)

quickemu

@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
 export LC_ALL=C
 
-if ((BASH_VERSINFO[0] < 4))
+if ((BASH_VERSINFO[0] < 4)); then
-then
   echo "Sorry, you need bash 4.0 or newer to run this script."
   exit 1
 fi
@@ -992,8 +991,8 @@ function vm_boot() {
             -device tpm-tis,tpmdev=tpm0)
   fi
 
-  if [ -n "$extra_args" ]; then
+  if [ -n "${extra_args}" ]; then
-      args+=($extra_args)
+      args+=("${extra_args}")
   fi
 
   # The OSK parameter contains parenthesis, they need to be escaped in the shell
@@ -1023,8 +1022,8 @@ function shortcut_create {
   local dirname="${HOME}/.local/share/applications"
   local filename="${HOME}/.local/share/applications/${VMNAME}.desktop"
 
-  if [ ! -d ${dirname} ]; then
+  if [ ! -d "${dirname}" ]; then
-    mkdir -p ${dirname}
+    mkdir -p "${dirname}"
   fi
   cat << EOF > "${filename}"
 [Desktop Entry]
@@ -1078,6 +1077,7 @@ bridge=""
 cpu_cores=""
 disk_img=""
 disk_size=""
+extra_args=""
 fixed_iso=""
 floppy=""
 guest_os="linux"
@@ -1090,7 +1090,6 @@ ram=""
 secureboot="off"
 tpm="off"
 usb_devices=()
-extra_args=""
 
 BRAILLE=""
 DELETE_DISK=0
@@ -1112,9 +1111,10 @@ VMDIR=""
 VMNAME=""
 VMPATH=""
 
+# shellcheck disable=SC2155
 readonly LAUNCHER=$(basename "${0}")
 readonly DISK_MIN_SIZE=$((197632 * 8))
-readonly VERSION="3.12"
+readonly VERSION="3.13"
 
 # PUBLICSHARE is the only directory exposed to guest VMs for file
 # sharing via 9P, spice-webdavd and Samba. This path is not configurable.
@@ -1300,3 +1300,5 @@ if [ ${SHORTCUT} -eq 1 ]; then
 fi
 
 vm_boot
+
+# vim:tabstop=2:shiftwidth=2:expandtab