aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2018-06-26 16:13:27 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2018-06-27 12:46:28 +0200
commit0eb21fbaf7afe2f70b60aa5021bf395bc7cd3dce (patch)
tree3c1373b2e27026b64d734f4ac4b5a9be96f2a76a
parenta15e4b160a94fceb1baa0027ef79cd816194b4f3 (diff)
downloadguix-0eb21fbaf7afe2f70b60aa5021bf395bc7cd3dce.tar
guix-0eb21fbaf7afe2f70b60aa5021bf395bc7cd3dce.tar.gz
gnu: cgit: Return #t from all phases.
* gnu/packages/version-control.scm (cgit)[arguments]: Substitute INVOKE for SYSTEM*.
-rw-r--r--gnu/packages/version-control.scm28
1 files changed, 13 insertions, 15 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 168ffeb12d..342b5325f8 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -579,9 +579,8 @@ collaboration using typical untrusted file hosts or services.")
(add-after 'unpack 'unpack-git
(lambda* (#:key inputs #:allow-other-keys)
;; Unpack the source of git into the 'git' directory.
- (zero? (system*
- "tar" "--strip-components=1" "-C" "git" "-xf"
- (assoc-ref inputs "git:src")))))
+ (invoke "tar" "--strip-components=1" "-C" "git" "-xf"
+ (assoc-ref inputs "git:src"))))
(add-after 'unpack 'patch-absolute-file-names
(lambda* (#:key inputs #:allow-other-keys)
(define (quoted-file-name input path)
@@ -612,21 +611,20 @@ collaboration using typical untrusted file hosts or services.")
(delete 'configure) ; no configure script
(add-after 'build 'build-man
(lambda* (#:key make-flags #:allow-other-keys)
- (zero? (apply system* `("make" ,@make-flags "doc-man")))))
+ (apply invoke "make" "doc-man" make-flags)))
(replace 'install
(lambda* (#:key make-flags outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
- (and (zero? (apply system*
- `("make" ,@make-flags
- ,(string-append "prefix=" out)
- ,(string-append
- "CGIT_SCRIPT_PATH=" out "/share/cgit")
- "install" "install-man")))
- ;; Move the platform-dependent 'cgit.cgi' into lib
- ;; to get it stripped.
- (rename-file (string-append out "/share/cgit/cgit.cgi")
- (string-append out "/lib/cgit/cgit.cgi"))
- #t))))
+ (apply invoke
+ "make" "install" "install-man"
+ (string-append "prefix=" out)
+ (string-append "CGIT_SCRIPT_PATH=" out "/share/cgit")
+ make-flags)
+ ;; Move the platform-dependent 'cgit.cgi' into lib to get it
+ ;; stripped.
+ (rename-file (string-append out "/share/cgit/cgit.cgi")
+ (string-append out "/lib/cgit/cgit.cgi"))
+ #t)))
(add-after 'install 'wrap-python-scripts
(lambda* (#:key outputs #:allow-other-keys)
(for-each