From fe46b00ba6fc2595b44a6344f6264459b0f52515 Mon Sep 17 00:00:00 2001
From: zawz <zawz@hotmail.fr>
Date: Wed, 7 Apr 2021 10:44:58 +0200
Subject: [PATCH] rename .config to .zpkgconfig for XDG config collisions

---
 .gitignore                             | 2 +-
 .config.example => .zpkgconfig.example | 0
 Makefile                               | 2 +-
 README.md                              | 2 +-
 scripts/server_deploy.sh               | 4 ++--
 server_scripts/database_update.sh      | 2 +-
 server_scripts/gen_install.sh          | 4 ++--
 src/deploy.sh                          | 2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)
 rename .config.example => .zpkgconfig.example (100%)

diff --git a/.gitignore b/.gitignore
index 5e3dd63..6567248 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/.config
+/.zpkgconfig
 /Zmakefile
 /zpkg
diff --git a/.config.example b/.zpkgconfig.example
similarity index 100%
rename from .config.example
rename to .zpkgconfig.example
diff --git a/Makefile b/Makefile
index d1da515..78a606a 100644
--- a/Makefile
+++ b/Makefile
@@ -14,4 +14,4 @@ minimal-deploy: minimal-build
 	scripts/server_deploy.sh
 
 minimal-build:
-	lxsh -o zpkg -m --minimize-var --exclude-var "$(var_exclude)" --minimize-fct --remove-unused src/main.sh
+	lxsh -o zpkg -m --minify-quotes --minify-var --exclude-var "$(var_exclude)" --minify-fct --remove-unused src/main.sh
diff --git a/README.md b/README.md
index e6a4096..a0def97 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ You need to be able to SSH to the zpkg user, SSH keys are recommended
 
 1. Clone this repository
 
-2. Write the desired config in `.config`, see `.config.example`
+2. Write the desired config in `.zpkgconfig`, see `.zpkgconfig.example`
 
 3. Run `make`
 
diff --git a/scripts/server_deploy.sh b/scripts/server_deploy.sh
index b5e2491..d322625 100755
--- a/scripts/server_deploy.sh
+++ b/scripts/server_deploy.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "$(pwd)/.config"
+. "$(pwd)/.zpkgconfig"
 
 [ -z "$TMPDIR" ] && TMPDIR=/tmp
 
@@ -19,7 +19,7 @@ random_string()
 
 # add sources to server
 ssh "$SSH_ADDRESS" mkdir -p "$PKG_PATH" || exit $?
-scp .config server_scripts/* "$SSH_ADDRESS":~/ || exit $?
+scp .zpkgconfig server_scripts/* "$SSH_ADDRESS":~/ || exit $?
 
 ## zpkg package
 
diff --git a/server_scripts/database_update.sh b/server_scripts/database_update.sh
index f53ddbd..580dcbc 100755
--- a/server_scripts/database_update.sh
+++ b/server_scripts/database_update.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. "$(pwd)/.config"
+. "$(pwd)/.zpkgconfig"
 
 [ -z "$TMPDIR" ] && TMPDIR=/tmp
 
diff --git a/server_scripts/gen_install.sh b/server_scripts/gen_install.sh
index d9ac848..97657b1 100755
--- a/server_scripts/gen_install.sh
+++ b/server_scripts/gen_install.sh
@@ -1,13 +1,13 @@
 #!/bin/sh
 
-. "$(pwd)/.config"
+. "$(pwd)/.zpkgconfig"
 
 # create install file
 # header
 echo '#!/bin/sh
 ' > install.sh
 # add config
-cat .config >> install.sh
+cat .zpkgconfig >> install.sh
 # body
 echo '
 
diff --git a/src/deploy.sh b/src/deploy.sh
index 8f8c534..bb100ce 100644
--- a/src/deploy.sh
+++ b/src/deploy.sh
@@ -36,7 +36,7 @@ package()
 deploy_package()
 {
   echo "Deploying $(basename "$1"): $(du -sh "$1" | awk '{print $1}')iB"
-  scp "$1" $SSH_ADDRESS:'$(grep "PKG_PATH=" .config | cut -d"=" -f2-)'
+  scp "$1" $SSH_ADDRESS:'$(grep "PKG_PATH=" .zpkgconfig | cut -d"=" -f2-)'
 }
 
 deploy_folder()