summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2015-09-12 20:03:14 +0200
committerMatthias Beyer <mail@beyermatthias.de>2015-09-12 20:03:14 +0200
commita29bcf131cf172d9d52f1e54b2de3c43fb6af587 (patch)
treee425b921bc7f9bc48cde7d19d2389661136ee8ee
parentba04a4b03ffef129f85e24e28ca403f6086e4a92 (diff)
parent238937a0d8e0c156fe0d5df0c6b32b8429f13488 (diff)
Merge pull request #83 from matthiasbeyer/help-text-cleanup
Help text cleanup
-rwxr-xr-xnix-script-channel-checkout-generation.sh2
-rwxr-xr-xnix-script-channel-diff-generations.sh2
-rwxr-xr-xnix-script-channel-list-generations.sh2
-rwxr-xr-xnix-script-diff-generations.sh2
-rwxr-xr-xnix-script-ls-profiles.sh2
-rwxr-xr-xnix-script-show-generation.sh2
-rwxr-xr-xnix-script-switch.sh2
-rwxr-xr-xnix-script-update-package-def.sh2
-rw-r--r--nix-utils.sh2
9 files changed, 9 insertions, 9 deletions
diff --git a/nix-script-channel-checkout-generation.sh b/nix-script-channel-checkout-generation.sh
index ba0db5e..a49067b 100755
--- a/nix-script-channel-checkout-generation.sh
+++ b/nix-script-channel-checkout-generation.sh
@@ -9,7 +9,7 @@ usage() {
-g <n> Generation to checkout
-h Show this help and exit
-$(help_end)
+$(help_end "channel")
EOS
}
diff --git a/nix-script-channel-diff-generations.sh b/nix-script-channel-diff-generations.sh
index 2e5972a..50e8499 100755
--- a/nix-script-channel-diff-generations.sh
+++ b/nix-script-channel-diff-generations.sh
@@ -11,7 +11,7 @@ usage() {
-n <generations> | Generations to show diff in form a..b
-h | Show this help and exit
-$(help_end)
+$(help_end "channel")
EOS
}
diff --git a/nix-script-channel-list-generations.sh b/nix-script-channel-list-generations.sh
index 3b4cc87..6dc53c4 100755
--- a/nix-script-channel-list-generations.sh
+++ b/nix-script-channel-list-generations.sh
@@ -11,7 +11,7 @@ usage() {
-h | Show this help and exit
-$(help_end)
+$(help_end "channel")
EOS
}
diff --git a/nix-script-diff-generations.sh b/nix-script-diff-generations.sh
index 9d2b825..5942b66 100755
--- a/nix-script-diff-generations.sh
+++ b/nix-script-diff-generations.sh
@@ -20,7 +20,7 @@ usage() {
# with verbosity on
nix-script -v diff-generations -s -n 123..145
-$(help_end)
+$(help_end "${BASH_SOURCE[0]}")
EOS
}
diff --git a/nix-script-ls-profiles.sh b/nix-script-ls-profiles.sh
index be2eae4..61f0d7d 100755
--- a/nix-script-ls-profiles.sh
+++ b/nix-script-ls-profiles.sh
@@ -28,7 +28,7 @@ usage() {
# With verbosity on.
nix-script -v ls-profiles -s -n
-$(help_end)
+$(help_end "${BASH_SOURCE[0]}")
EOS
}
diff --git a/nix-script-show-generation.sh b/nix-script-show-generation.sh
index 60216c6..75bfda0 100755
--- a/nix-script-show-generation.sh
+++ b/nix-script-show-generation.sh
@@ -20,7 +20,7 @@ usage() {
# With verbosity on.
nix-script -v show-generations -s
-$(help_end)
+$(help_end "${BASH_SOURCE[0]}")
EOS
}
diff --git a/nix-script-switch.sh b/nix-script-switch.sh
index 572dac5..19b04a2 100755
--- a/nix-script-switch.sh
+++ b/nix-script-switch.sh
@@ -50,7 +50,7 @@ $(help_rcvars \
"RC_SWITCH_DEFAULT_TAG_FLAGS_NIXPKGS - Default git-tag flags for tagging in nixpkgs"
)
-$(help_end)
+$(help_end "${BASH_SOURCE[0]}")
EOS
}
diff --git a/nix-script-update-package-def.sh b/nix-script-update-package-def.sh
index 6966741..45be7c4 100755
--- a/nix-script-update-package-def.sh
+++ b/nix-script-update-package-def.sh
@@ -47,7 +47,7 @@ usage() {
# Verbosity is on.
nix-script -v update-package-def -b -u http://monitor.nixos.org/patch?p=ffmpeg-full&v=2.7.1&m=Matthias+Beyer
-$(help_end)
+$(help_end "${BASH_SOURCE[0]}")
EOS
}
diff --git a/nix-utils.sh b/nix-utils.sh
index a289018..9e2fd3c 100644
--- a/nix-utils.sh
+++ b/nix-utils.sh
@@ -40,7 +40,7 @@ scriptname_to_command() {
#
help_synopsis() {
SCRIPT=$(scriptname_to_command $1); shift
- echo "usage: nix-script $SCRIPT $*"
+ echo "usage: nix-script [-v] $SCRIPT $*"
}
#