Merge pull request #4268 from hashicorp/bugfix/sed-in-place
Fix sed on linux
This commit is contained in:
commit
fe14af4916
|
@ -32,8 +32,10 @@ CONSUL_PKG_NAME="consul"
|
||||||
if test "$(uname)" == "Darwin"
|
if test "$(uname)" == "Darwin"
|
||||||
then
|
then
|
||||||
SED_EXT="-E"
|
SED_EXT="-E"
|
||||||
|
alias sed_i="sed -i ''"
|
||||||
else
|
else
|
||||||
SED_EXT=""
|
SED_EXT=""
|
||||||
|
alias sed_i="sed -i"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CONSUL_BINARY_TYPE=oss
|
CONSUL_BINARY_TYPE=oss
|
||||||
|
|
|
@ -623,7 +623,7 @@ function update_version {
|
||||||
local version="$2"
|
local version="$2"
|
||||||
local prerelease="$3"
|
local prerelease="$3"
|
||||||
|
|
||||||
sed ${SED_EXT} -i "" -e "s/(Version[[:space:]]*=[[:space:]]*)\"[^\"]*\"/\1\"${version}\"/g" -e "s/(VersionPrerelease[[:space:]]*=[[:space:]]*)\"[^\"]*\"/\1\"${prerelease}\"/g" "${vfile}"
|
sed_i ${SED_EXT} -e "s/(Version[[:space:]]*=[[:space:]]*)\"[^\"]*\"/\1\"${version}\"/g" -e "s/(VersionPrerelease[[:space:]]*=[[:space:]]*)\"[^\"]*\"/\1\"${prerelease}\"/g" "${vfile}"
|
||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -658,7 +658,7 @@ function set_changelog_version {
|
||||||
rel_date=$(date +"%B %d, %Y")
|
rel_date=$(date +"%B %d, %Y")
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sed ${SED_EXT} -i "" -e "s/## UNRELEASED/## ${version} (${rel_date})/" "${changelog}"
|
sed_i ${SED_EXT} -e "s/## UNRELEASED/## ${version} (${rel_date})/" "${changelog}"
|
||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -678,7 +678,7 @@ function unset_changelog_version {
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sed ${SED_EXT} -i "" -e "1 s/^## [0-9]+\.[0-9]+\.[0-9]+ \([^)]*\)/## UNRELEASED/" "${changelog}"
|
sed_i ${SED_EXT} -e "1 s/^## [0-9]+\.[0-9]+\.[0-9]+ \([^)]*\)/## UNRELEASED/" "${changelog}"
|
||||||
return $?
|
return $?
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue