Merge pull request #83 from matthiasbeyer/help-text-cleanup

Help text cleanup
fkz · Sep 12, 2015 · a29bcf1 · a29bcf1
2 parents ba04a4b + 238937a
commit a29bcf1
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 $*"
 }
 
 #
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,7 @@ usage() { @@
         -h      | Show this help and exit
-    $(help_end)
+    $(help_end "channel")
     EOS
     }
@@ Expand Down @@