Merge pull request #502 from nodogsplash/debian-testing

debian: fixes to allow library scripts to run
nodogsplash · Jan 19, 2020 · 0ae13c0 · 0ae13c0
2 parents b5b05c7 + 07fae43
commit 0ae13c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -45,11 +45,17 @@ install:
 	cp resources/splash.jpg $(DESTDIR)/etc/nodogsplash/htdocs/images/
 	mkdir -p $(DESTDIR)/usr/lib/nodogsplash
 	cp forward_authentication_service/PreAuth/demo-preauth.sh $(DESTDIR)/usr/lib/nodogsplash/login.sh
+	sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/nodogsplash/login.sh
 	cp forward_authentication_service/libs/get_client_interface.sh $(DESTDIR)/usr/lib/nodogsplash/
+	sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/nodogsplash/get_client_interface.sh
 	cp forward_authentication_service/libs/get_client_token.sh $(DESTDIR)/usr/lib/nodogsplash/
+	sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/nodogsplash/get_client_token.sh
 	cp forward_authentication_service/libs/unescape.sh $(DESTDIR)/usr/lib/nodogsplash/
+	sed -i 's/#!\/bin\/sh/#!\/bin\/bash/' $(DESTDIR)/usr/lib/nodogsplash/unescape.sh
 	cp forward_authentication_service/fas-aes/fas-aes.php $(DESTDIR)/etc/nodogsplash/
 
+
+
 checkastyle:
 	@command -v astyle >/dev/null 2>&1 || \
 	{ echo >&2 "We need 'astyle' but it's not installed. Aborting."; exit 1; }

diff --git a/src/http_microhttpd.c b/src/http_microhttpd.c
@@ -1463,7 +1463,7 @@ size_t unescape(void * cls, struct MHD_Connection *c, char *src)
 	char msg[QUERYMAXLEN] = {0};
 
 	debug(LOG_INFO, "Escaped string=%s\n", src);
-	snprintf(unescapecmd, QUERYMAXLEN, "/usr/lib/nodogsplash/./unescape.sh -url \"%s\"", src);
+	snprintf(unescapecmd, QUERYMAXLEN, "/usr/lib/nodogsplash/unescape.sh -url \"%s\"", src);
 	debug(LOG_DEBUG, "unescapecmd=%s\n", unescapecmd);
 
 	if (execute_ret_url_encoded(msg, sizeof(msg) - 1, unescapecmd) == 0) {

diff --git a/src/util.c b/src/util.c
@@ -84,7 +84,7 @@ int get_client_interface(char* clientif, int clientif_len, const char *climac)
 {
 	char *clifcmd = NULL;
 
-	safe_asprintf(&clifcmd, "/usr/lib/nodogsplash/./get_client_interface.sh %s", climac);
+	safe_asprintf(&clifcmd, "/usr/lib/nodogsplash/get_client_interface.sh %s", climac);
 
 	if (execute_ret_url_encoded(clientif, clientif_len - 1, clifcmd) == 0) {
 		debug(LOG_DEBUG, "Client Mac Address: %s", climac);