From 24c97c6988fa1c2314c2f300003b02c8026f2887 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 12 Nov 2017 00:22:54 +0200 Subject: [PATCH 1/2] makefile: force overwrite target binary fixes "cp: cannot create regular file '/xlxd/xlxd': Text file busy --- src/makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/makefile b/src/makefile index f0f1378..691c14e 100644 --- a/src/makefile +++ b/src/makefile @@ -18,7 +18,7 @@ clean: install: mkdir -p /xlxd - cp $(EXECUTABLE) /xlxd/ + cp -f $(EXECUTABLE) /xlxd/ cp -i ../config/xlxd.blacklist /xlxd/ cp -i ../config/xlxd.whitelist /xlxd/ cp -i ../config/xlxd.interlink /xlxd/ From 6f940fcc31af6d28443c41afe214c041f0d0eda1 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Sun, 12 Nov 2017 00:24:22 +0200 Subject: [PATCH 2/2] makefile: dont ask to overwrite configfiles. install .sample configs instead --- src/makefile | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/makefile b/src/makefile index 691c14e..de1e0db 100644 --- a/src/makefile +++ b/src/makefile @@ -19,6 +19,12 @@ clean: install: mkdir -p /xlxd cp -f $(EXECUTABLE) /xlxd/ - cp -i ../config/xlxd.blacklist /xlxd/ - cp -i ../config/xlxd.whitelist /xlxd/ - cp -i ../config/xlxd.interlink /xlxd/ + [ -f /xlxd/xlxd.blacklist ] && \ + cp ../config/xlxd.blacklist /xlxd/xlxd.blacklist.sample || \ + cp ../config/xlxd.blacklist /xlxd/xlxd.blacklist + [ -f /xlxd/xlxd.whitelist ] && \ + cp ../config/xlxd.whitelist /xlxd/xlxd.whitelist.sample || \ + cp ../config/xlxd.whitelist /xlxd/xlxd.whitelist + [ -f /xlxd/xlxd.interlink ] && \ + cp ../config/xlxd.interlink /xlxd/xlxd.interlink.sample || \ + cp ../config/xlxd.interlink /xlxd/xlxd.interlink