summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xnix-script2
-rwxr-xr-xnix-script-update-package-def.sh6
2 files changed, 7 insertions, 1 deletions
diff --git a/nix-script b/nix-script
index 4acc38d..5c22a90 100755
--- a/nix-script
+++ b/nix-script
@@ -86,7 +86,7 @@ then
exit 0
fi
-[ -z "$COMMAND" ] && stderr "No command given" && exit 0
+[ -z "$COMMAND" ] && stderr "No command given" && exit 1
stdout "Searching for script for '$COMMAND'"
SCRIPT=$(script_for $COMMAND)
diff --git a/nix-script-update-package-def.sh b/nix-script-update-package-def.sh
index ce44326..85b64a8 100755
--- a/nix-script-update-package-def.sh
+++ b/nix-script-update-package-def.sh
@@ -93,6 +93,12 @@ curl $URL > $TMP
stdout "Parsing subject to branch name"
PKG=$(cat $TMP | grep Subject | cut -d: -f 2 | sed -r 's,(\ *)(.*)(\ *),\2,')
+#translate subject line if necessary
+if [[ $(cat $TMP | grep "update from") ]]
+then
+ sed -i -r 's;Subject\:\ (.*)\:\ update from (.*) to (.*);Subject: \1\:\ \2 \ -> \3;' $TMP
+fi
+
CURRENT_BRANCH=$(__git_current_branch "$NIXPKGS")
__git "$NIXPKGS" checkout -b update-$PKG
if [[ $? -ne 0 ]]