CMXSL.org/package-helpers-cmxsl
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Redirect sed wrapper messages to stderr

Browse source
This commit is contained in:
Ruben Rodriguez 2021-04-28 16:07:42 -04:00
parent 6b1d7e24ea
commit 57e1963db7
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
helpers/config
View file

@ -209,10 +209,10 @@ sedhelper2(){
while [ 1"$EXPR" != 1 ];do while [ 1"$EXPR" != 1 ];do
SUBEXPR=$(cut -d\; -f 1 <<< "$EXPR") SUBEXPR=$(cut -d\; -f 1 <<< "$EXPR")
MD5=$(md5sum "$FILE") MD5=$(md5sum "$FILE")
echo Running modification-aware sed: sed "$SUBEXPR" -i "$FILE" echo Running modification-aware sed: sed "$SUBEXPR" -i "$FILE" 1>&2
/bin/sed "$SUBEXPR" -i "$FILE" /bin/sed "$SUBEXPR" -i "$FILE"
if [ "$MD5" = "$(md5sum "$FILE")" ]; then if [ "$MD5" = "$(md5sum "$FILE")" ]; then
echo File "$FILE" was not modified, stopping. echo File "$FILE" was not modified, stopping. 1>&2
exit 1 exit 1
fi fi
EXPR=$(cut -d\; -f 2- <<< "$EXPR" ) EXPR=$(cut -d\; -f 2- <<< "$EXPR" )
@ -225,17 +225,17 @@ sedhelper(){
EXPR="$2" EXPR="$2"
MD5=$(md5sum "$FILE") MD5=$(md5sum "$FILE")
echo Running modification-aware sed: sed "$EXPR" -i "$FILE" echo Running modification-aware sed: sed "$EXPR" -i "$FILE" 1>&2
/bin/sed "$EXPR" -i "$FILE" /bin/sed "$EXPR" -i "$FILE"
if [ "$MD5" = "$(md5sum "$FILE")" ]; then if [ "$MD5" = "$(md5sum "$FILE")" ]; then
echo File "$FILE" was not modified, stopping. echo File "$FILE" was not modified, stopping. 1>&2
exit 1 exit 1
fi fi
} }
sed (){ sed (){
if ! echo $@ | grep -qw '\-i'; then if ! echo $@ | grep -qw '\-i'; then
echo Running fallback sed: /bin/sed "$@" echo Running fallback sed: /bin/sed "$@" 1>&2
/bin/sed "$@" /bin/sed "$@"
else else
@ -248,7 +248,7 @@ else
if [ -f "$FILE" ]; then if [ -f "$FILE" ]; then
sedhelper "$FILE" "$SEDEXPR" sedhelper "$FILE" "$SEDEXPR"
else else
echo File "$FILE" does not exist, stopping. echo File "$FILE" does not exist, stopping. 1>&2
exit 1 exit 1
fi fi
done done