build: Use if/then instead of `||` so that the `-e` flag works

diff --git a/CHANGELOG b/CHANGELOG
index bb773ad148d32467dd4cbfd92e0919cba1ddf1f6..69721498feb1e715e0703562dbd6fc7802fa36b8 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,6 +6,7 @@ ikiwiki (3.20180106) UNRELEASED; urgency=medium
     Discount >= 2.2.0 (Closes: #888055)
   * build: `set -e` before each `for` loop, so that errors are reliably
     trapped
     Discount >= 2.2.0 (Closes: #888055)
   * build: `set -e` before each `for` loop, so that errors are reliably
     trapped

+  * build: Use if/then instead of `||` so that the `-e` flag works

 
  -- Simon McVittie <smcv@debian.org>  Mon, 08 Jan 2018 10:51:10 +0000
 
 
  -- Simon McVittie <smcv@debian.org>  Mon, 08 Jan 2018 10:51:10 +0000
 

diff --git a/Makefile.PL b/Makefile.PL
index 3022aa40e58816ff533fc29c43cc26472f39f4e5..907ff30c9159c4b316dc31029d16693e60435b4e 100755 (executable)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -99,8 +99,9 @@ underlay_install:
        for dir in `cd underlays && $(FIND) . -follow -type d`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name jquery.js ! -name jquery-ui.css ! -name jquery-ui.js ! -name jquery.tmpl.js`; do \
        for dir in `cd underlays && $(FIND) . -follow -type d`; do \
                install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
                for file in `$(FIND) underlays/$$dir -follow -maxdepth 1 -type f ! -name jquery.js ! -name jquery-ui.css ! -name jquery-ui.js ! -name jquery.tmpl.js`; do \

-                       cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null || \
-                       install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+                       if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir 2>/dev/null; then \
+                               install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+                       fi; \

                done; \
        done
 
                done; \
        done
 


@@ -109,8 +110,9 @@ underlay_install:
        set -e; \
        for file in doc/ikiwiki/directive/*; do \
                if [ -f "$$file" ]; then \
        set -e; \
        for file in doc/ikiwiki/directive/*; do \
                if [ -f "$$file" ]; then \

-                       cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null || \
-                       install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
+                       if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive 2>/dev/null; then \
+                               install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/directives/ikiwiki/directive; \
+                       fi; \

                fi \
        done
 
                fi \
        done
 


@@ -125,8 +127,9 @@ underlay_install:
                        elif echo "$$file" | grep -q base.css; then \
                                :; \
                        elif [ -f "$$file" ]; then \
                        elif echo "$$file" | grep -q base.css; then \
                                :; \
                        elif [ -f "$$file" ]; then \

-                               cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null || \
-                               install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
+                               if ! cp -pRL $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file 2>/dev/null; then \
+                                       install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$file; \
+                               fi; \

                        fi \
                done; \
        done
                        fi \
                done; \
        done


@@ -139,8 +142,9 @@ extra_install: underlay_install
        done
        set -e; \
        for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \
        done
        set -e; \
        for file in `cd doc/examples; $(FIND) . -type f ! -regex '.*discussion.*'`; do \

-               cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null || \
-               install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
+               if ! cp -pRL doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file 2>/dev/null; then \
+                       install -m 644 doc/examples/$$file $(DESTDIR)$(PREFIX)/share/ikiwiki/examples/$$file; \
+               fi; \

        done
 
        set -e; \
        done
 
        set -e; \