guix: use a temporary file over sponge
Remove sponge (moreutils).
This commit is contained in:
3 files changed
+8
-35
No files matched your search
@@ -400,12 +400,14 @@ mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" \
|
|||||||
|| ( rm -rf "$ACTUAL_OUTDIR" && exit 1 )
|
|| ( rm -rf "$ACTUAL_OUTDIR" && exit 1 )
|
||||||
|
|
||||||
(
|
(
|
||||||
|
tmp="$(mktemp)"
|
||||||
cd /outdir-base
|
cd /outdir-base
|
||||||
{
|
{
|
||||||
echo "$GIT_ARCHIVE"
|
echo "$GIT_ARCHIVE"
|
||||||
find "$ACTUAL_OUTDIR" -type f
|
find "$ACTUAL_OUTDIR" -type f
|
||||||
} | xargs realpath --relative-base="$PWD" \
|
} | xargs realpath --relative-base="$PWD" \
|
||||||
| xargs sha256sum \
|
| xargs sha256sum \
|
||||||
| sort -k2 \
|
| sort -k2 \
|
||||||
| sponge "$ACTUAL_OUTDIR"/SHA256SUMS.part
|
> "$tmp";
|
||||||
|
mv "$tmp" "$ACTUAL_OUTDIR"/SHA256SUMS.part
|
||||||
)
|
)
|
||||||
@@ -141,6 +141,7 @@ mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" \
|
|||||||
|| ( rm -rf "$ACTUAL_OUTDIR" && exit 1 )
|
|| ( rm -rf "$ACTUAL_OUTDIR" && exit 1 )
|
||||||
|
|
||||||
(
|
(
|
||||||
|
tmp="$(mktemp)"
|
||||||
cd /outdir-base
|
cd /outdir-base
|
||||||
{
|
{
|
||||||
echo "$CODESIGNING_TARBALL"
|
echo "$CODESIGNING_TARBALL"
|
||||||
@@ -149,5 +150,6 @@ mv --no-target-directory "$OUTDIR" "$ACTUAL_OUTDIR" \
|
|||||||
} | xargs realpath --relative-base="$PWD" \
|
} | xargs realpath --relative-base="$PWD" \
|
||||||
| xargs sha256sum \
|
| xargs sha256sum \
|
||||||
| sort -k2 \
|
| sort -k2 \
|
||||||
| sponge "$ACTUAL_OUTDIR"/SHA256SUMS.part
|
> "$tmp";
|
||||||
|
mv "$tmp" "$ACTUAL_OUTDIR"/SHA256SUMS.part
|
||||||
)
|
)
|
||||||
@@ -521,36 +521,6 @@ inspecting signatures in Mach-O binaries.")
|
|||||||
(("^install-others =.*$")
|
(("^install-others =.*$")
|
||||||
(string-append "install-others = " out "/etc/rpc\n")))))))))))))
|
(string-append "install-others = " out "/etc/rpc\n")))))))))))))
|
||||||
|
|
||||||
;; The sponge tool from moreutils.
|
|
||||||
(define-public sponge
|
|
||||||
(package
|
|
||||||
(name "sponge")
|
|
||||||
(version "0.69")
|
|
||||||
(source (origin
|
|
||||||
(method url-fetch)
|
|
||||||
(uri (string-append
|
|
||||||
"https://git.joeyh.name/index.cgi/moreutils.git/snapshot/
|
|
||||||
moreutils-" version ".tar.gz"))
|
|
||||||
(file-name (string-append "moreutils-" version ".tar.gz"))
|
|
||||||
(sha256
|
|
||||||
(base32
|
|
||||||
"1l859qnzccslvxlh5ghn863bkq2vgmqgnik6jr21b9kc6ljmsy8g"))))
|
|
||||||
(build-system gnu-build-system)
|
|
||||||
(arguments
|
|
||||||
(list #:phases
|
|
||||||
#~(modify-phases %standard-phases
|
|
||||||
(delete 'configure)
|
|
||||||
(replace 'install
|
|
||||||
(lambda* (#:key outputs #:allow-other-keys)
|
|
||||||
(let ((bin (string-append (assoc-ref outputs "out") "/bin")))
|
|
||||||
(install-file "sponge" bin)))))
|
|
||||||
#:make-flags
|
|
||||||
#~(list "sponge" (string-append "CC=" #$(cc-for-target)))))
|
|
||||||
(home-page "https://joeyh.name/code/moreutils/")
|
|
||||||
(synopsis "Miscellaneous general-purpose command-line tools")
|
|
||||||
(description "Just sponge")
|
|
||||||
(license license:gpl2+)))
|
|
||||||
|
|
||||||
(packages->manifest
|
(packages->manifest
|
||||||
(append
|
(append
|
||||||
(list ;; The Basics
|
(list ;; The Basics
|
||||||
@@ -565,7 +535,6 @@ inspecting signatures in Mach-O binaries.")
|
|||||||
patch
|
patch
|
||||||
gawk
|
gawk
|
||||||
sed
|
sed
|
||||||
sponge
|
|
||||||
;; Compression and archiving
|
;; Compression and archiving
|
||||||
tar
|
tar
|
||||||
gzip
|
gzip
|
||||||
|
|||||||
Reference in new issue
Block a user