update-channel-branches: fix to work with posix /bin/sh
Should now work equally well with bash (as on NixOS) and dash (on various other distributions). The only truly required change was on line 10: "function" is a superfluous keyword that's not present in posix sh. Change-Id: If917499b2e24c0d039e8c61208227b90c9fc5c0d
This commit is contained in:
parent
c08716029b
commit
92aef0621f
|
@ -1,13 +1,14 @@
|
||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
set -e
|
||||||
|
|
||||||
: ${NIXOS_CHANNELS:=https://nixos.org/channels/}
|
: ${NIXOS_CHANNELS:=https://nixos.org/channels/}
|
||||||
: ${CHANNELS_NAMESPACE:=refs/heads/channels/}
|
: ${CHANNELS_NAMESPACE:=refs/heads/channels/}
|
||||||
|
|
||||||
# List all channels which are currently in the repository which we would
|
# List all channels which are currently in the repository which we would
|
||||||
# have to remove if they are not found again.
|
# have to remove if they are not found again.
|
||||||
deadChannels=$(git for-each-ref --format="%(refname)" $CHANNELS_NAMESPACE)
|
deadChannels=$(git for-each-ref --format="%(refname)" "$CHANNELS_NAMESPACE")
|
||||||
|
|
||||||
function updateRef() {
|
updateRef() {
|
||||||
local channelName=$1
|
local channelName=$1
|
||||||
local newRev=$2
|
local newRev=$2
|
||||||
|
|
||||||
|
@ -17,9 +18,9 @@ function updateRef() {
|
||||||
# Update the local refs/heads/channels/* branches to be in-sync with the
|
# Update the local refs/heads/channels/* branches to be in-sync with the
|
||||||
# channel references.
|
# channel references.
|
||||||
local branch=$CHANNELS_NAMESPACE$channelName
|
local branch=$CHANNELS_NAMESPACE$channelName
|
||||||
oldRev=$(git rev-parse --short $branch 2>/dev/null || true)
|
oldRev=$(git rev-parse --short "$branch" 2>/dev/null || true)
|
||||||
if test "$oldRev" != "$newRev"; then
|
if test "$oldRev" != "$newRev"; then
|
||||||
if git update-ref $branch $newRev 2>/dev/null; then
|
if git update-ref "$branch" "$newRev" 2>/dev/null; then
|
||||||
if test -z "$oldRev"; then
|
if test -z "$oldRev"; then
|
||||||
echo " * [new branch] $newRev -> ${branch#refs/heads/}"
|
echo " * [new branch] $newRev -> ${branch#refs/heads/}"
|
||||||
else
|
else
|
||||||
|
@ -35,21 +36,21 @@ function updateRef() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Filter out the current channel from the list of dead channels.
|
# Filter out the current channel from the list of dead channels.
|
||||||
deadChannels=$(grep -v $CHANNELS_NAMESPACE$channelName <<EOF
|
deadChannels=$(grep -v "$CHANNELS_NAMESPACE$channelName" <<EOF
|
||||||
$deadChannels
|
$deadChannels
|
||||||
EOF
|
EOF
|
||||||
)
|
) ||true
|
||||||
}
|
}
|
||||||
|
|
||||||
# Find the name of all channels which are listed in the directory.
|
# Find the name of all channels which are listed in the directory.
|
||||||
echo "Fetching channels from $NIXOS_CHANNELS:"
|
echo "Fetching channels from $NIXOS_CHANNELS:"
|
||||||
for channelName in : $(curl -s $NIXOS_CHANNELS | sed -n '/folder/ { s,.*href=",,; s,/".*,,; p }'); do
|
for channelName in : $(curl -s "$NIXOS_CHANNELS" | sed -n '/folder/ { s,.*href=",,; s,/".*,,; p }'); do
|
||||||
test "$channelName" = : && continue;
|
test "$channelName" = : && continue;
|
||||||
|
|
||||||
# Do not follow redirections, such that we can extract the
|
# Do not follow redirections, such that we can extract the
|
||||||
# short-changeset from the name of the directory where we are
|
# short-changeset from the name of the directory where we are
|
||||||
# redirected to.
|
# redirected to.
|
||||||
sha1=$(curl -sI $NIXOS_CHANNELS$channelName | sed -n '/Location/ { s,.*\.\([a-f0-9]*\)[ \r]*$,\1,; p; }')
|
sha1=$(curl -sI "$NIXOS_CHANNELS$channelName" | sed -n '/Location/ { s,.*\.\([a-f0-9]*\)[ \r]*$,\1,; p; }')
|
||||||
|
|
||||||
updateRef "remotes/$channelName" "$sha1"
|
updateRef "remotes/$channelName" "$sha1"
|
||||||
done
|
done
|
||||||
|
@ -60,13 +61,13 @@ if currentSystem=$(nixos-version 2>/dev/null); then
|
||||||
# then the version is not annotated in git version. This sed
|
# then the version is not annotated in git version. This sed
|
||||||
# expression is basically matching that the expressions end with
|
# expression is basically matching that the expressions end with
|
||||||
# ".<sha1> (Name)" to extract the sha1.
|
# ".<sha1> (Name)" to extract the sha1.
|
||||||
sha1=$(echo $currentSystem | sed -n 's,^.*\.\([a-f0-9]*\) *(.*)$,\1,; T skip; p; :skip;')
|
sha1=$(echo "$currentSystem" | sed -n 's,^.*\.\([a-f0-9]*\) *(.*)$,\1,; T skip; p; :skip;')
|
||||||
|
|
||||||
updateRef current-system "$sha1"
|
updateRef current-system "$sha1"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "Fetching channels from ~/.nix-defexpr:"
|
echo "Fetching channels from $HOME/.nix-defexpr:"
|
||||||
for revFile in : $(find -L ~/.nix-defexpr/ -maxdepth 4 -name svn-revision); do
|
for revFile in : $(find -L "$HOME/.nix-defexpr/" -maxdepth 4 -name svn-revision); do
|
||||||
test "$revFile" = : && continue;
|
test "$revFile" = : && continue;
|
||||||
|
|
||||||
# Deconstruct a path such as, into:
|
# Deconstruct a path such as, into:
|
||||||
|
@ -85,7 +86,7 @@ for revFile in : $(find -L ~/.nix-defexpr/ -maxdepth 4 -name svn-revision); do
|
||||||
test -z "$user" && user=$USER
|
test -z "$user" && user=$USER
|
||||||
channelName="$user${user:+/}$repo"
|
channelName="$user${user:+/}$repo"
|
||||||
|
|
||||||
sha1=$(cat $revFile | sed -n 's,^.*\.\([a-f0-9]*\)$,\1,; T skip; p; :skip;')
|
sha1=$(sed -n 's,^.*\.\([a-f0-9]*\)$,\1,; T skip; p; :skip;' "$revFile")
|
||||||
|
|
||||||
updateRef "$channelName" "$sha1"
|
updateRef "$channelName" "$sha1"
|
||||||
done
|
done
|
||||||
|
|
Loading…
Reference in a new issue