From: Ian Jackson Date: Sun, 3 Mar 2019 10:55:13 +0000 (+0000) Subject: bowdlerise X-Git-Tag: nailing-cargo/1.0.0~249 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=5afc9983002ad76e22796ab0814d668e77c05250;p=nailing-cargo.git bowdlerise --- diff --git a/fucking-cargo b/fucking-cargo index 7582f1c..9bf28b5 100755 --- a/fucking-cargo +++ b/fucking-cargo @@ -1,7 +1,7 @@ #!/bin/bash set -e -# CARGO='../fucking-cargo/fucking-cargo cargo' make && make check CARGO='../fucking-cargo/fucking-cargo cargo' +# CARGO='../nailing-cargo/nailing-cargo cargo' make && make check CARGO='../nailing-cargo/nailing-cargo cargo' # Why do we need this ? @@ -10,20 +10,20 @@ set -e # https://github.com/rust-lang/cargo/issues/1481 -lock=${PWD%/*}/.fuck.lock -if [ "x$FUCKING_CARGO" != "x$lock" ]; then - FUCKING_CARGO=$lock \ +lock=${PWD%/*}/.nail.lock +if [ "x$NAILING_CARGO" != "x$lock" ]; then + NAILING_CARGO=$lock \ exec with-lock-ex -w "$lock" "$0" "$@" fi -exec 203<../Fuck +exec 203<../Cargo.nail f=Cargo.toml sed=' /^ *\[dependencies\]/,/^ \[/{ ' -exec 204<../Fuck +exec 204<../Cargo.nail while read <&204 what where; do if [ "x$what" = x- ]; then continue; fi if [ "x$what" = 'x#' ]; then continue; fi @@ -38,20 +38,20 @@ done sed+='} ' -exec 204<../Fuck +exec 204<../Cargo.nail while read <&204 what where; do if [ "x$what" = 'x#' ]; then continue; fi wf=../$where/$f - rm -f $wf.fucking~ - sed <$wf >$wf.fucking~ "$sed" + rm -f $wf.nailing~ + sed <$wf >$wf.nailing~ "$sed" done -exec 204<../Fuck +exec 204<../Cargo.nail while read <&204 what where; do if [ "x$what" = 'x#' ]; then continue; fi wf=../$where/$f - if ! test -e $wf.unfucked~; then - ln $wf $wf.unfucked~ + if ! test -e $wf.unnailed~; then + ln $wf $wf.unnailed~ fi done @@ -60,27 +60,27 @@ trap ' while read <&203 what where; do if [ "x$what" = "x#" ]; then continue; fi wf=../$where/$f - if test -e $wf.unfucked~; then - rm -f $wf.fucked~ - ln $wf $wf.fucked~ - mv -f $wf.unfucked~ $wf + if test -e $wf.unnailed~; then + rm -f $wf.nailed~ + ln $wf $wf.nailed~ + mv -f $wf.unnailed~ $wf fi done - echo >&2 'Unfucked' + echo >&2 'Unnailed' ' EXIT -exec 204<../Fuck -printf >&2 'Fucking' +exec 204<../Cargo.nail +printf >&2 'Nailing' while read <&204 what where; do if [ "x$what" = 'x#' ]; then continue; fi wf=../$where/$f printf >&2 ' %s' "$what" - if cmp -s $wf.fucked~ $wf.fucking~; then - mv -f $wf.fucked~ $wf - rm -f $wf.fucking + if cmp -s $wf.nailed~ $wf.nailing~; then + mv -f $wf.nailed~ $wf + rm -f $wf.nailing else - mv -f $wf.fucking~ $wf - rm -f $wf.fucked + mv -f $wf.nailing~ $wf + rm -f $wf.nailed fi done echo >&2