fix makefile deletion risk

diff --git a/Makefile b/Makefile
index 57569dc8aa851aa5b3930339d3581a9ff0b68e27..b2b0f9a820cdf5d9a1516ebeb0234ec62808fcbf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ SQLITE = "sqlite3"
 CONF = "src/config.json"
 PHP = "php"
 CURL = "curl"
-DESTDIR = $(shell $(CURDIR)/$(NODEJQ) -r ".dest" $(CURDIR)/$(CONF))
+DESTDIR = $(shell $(CURDIR)/$(NODEJQ) -r '.dest // "" | select(. != "") // "dist"' $(CURDIR)/$(CONF))
 SITEDOMAIN = $(shell $(CURDIR)/$(NODEJQ) -r ".DOMAIN" $(CURDIR)/$(CONF))
 FILESDOMAIN = $(shell $(CURDIR)/$(NODEJQ) -r ".FILE_DOMAIN" $(CURDIR)/$(CONF))
 MAXSIZE = $(shell $(CURDIR)/$(NODEJQ) -r ".max_upload_size" $(CURDIR)/$(CONF))

diff --git a/package.json b/package.json
index 10c3cf9c9d46f4276b3e0ba4c4339cfa2a681772..d823d1a9f79f8c1de2c4cc2b9503f85926f4714b 100644 (file)
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uguu",
-  "version": "1.7.5",
+  "version": "1.7.6",
   "description": "Uguu is a simple lightweight temporary file host with support for drop, paste, click and API uploading.",
   "homepage": "https://uguu.se",
   "repository": {

diff --git a/src/config.json b/src/config.json
index 03178dd97e3f7a08b97c775de4253f40dc96cac1..3e5b2b9cc45ffd5ff9cd7f5c04c192d33631a376 100755 (executable)
--- a/src/config.json
+++ b/src/config.json
@@ -3,7 +3,7 @@
     "allowErrors": false
   },
   "dest": "dist",
-  "pkgVersion": "1.7.5",
+  "pkgVersion": "1.7.6",
   "pages": [
     "index.ejs",
     "faq.ejs",