From 3bf68db6a441c81f2928ce5ef4e9db91b1570620 Mon Sep 17 00:00:00 2001 From: Julian Calaby Date: Wed, 22 Jul 2015 12:53:42 +1000 Subject: [PATCH] Use the actual executable path in the help messages And it doesn't cost any lines --- bocker | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/bocker b/bocker index 2627ed6..fbd518a 100755 --- a/bocker +++ b/bocker @@ -71,21 +71,21 @@ btrfs subvolume snapshot "$btrfs_path/$1" "$btrfs_path/$2" > /dev/null echo "Created: $2" } function HELP() { -sed -n "s/\\\\n/\n\t/g;s/$/\n/;s/^.*#HELP\\s//p;" < $1 +sed -n "s/\\\\n/\n\t/g;s/BOCKER/${1/\//\\\/}/g;s/$/\n/;s/^.*#HELP\\s//p;" < $1 exit 0 } [[ -z "${1-}" ]] && HELP $0 case $1 in - init) INIT "$2" ;; #HELP Create an image:\n./bocker init - images) IMAGES ;; #HELP List images:\n./bocker images - run) #HELP Create a container:\n./bocker run + init) INIT "$2" ;; #HELP Create an image:\nBOCKER init + images) IMAGES ;; #HELP List images:\nBOCKER images + run) #HELP Create a container:\nBOCKER run IMAGE="$2" shift && shift RUN "$IMAGE" "$*" ;; - ps) PS ;; #HELP List containers:\n./bocker ps - logs) LOGS "$2" ;; #HELP View logs from a container:\n./bocker logs - commit) COMMIT "$2" "$3" ;; #HELP Commit a container to the image:\n./bocker commit - rm) RM "$2" ;; #HELP Delete an image or container:\n./bocker rm - *) HELP $0 ;; #HELP Display this message:\n./bocker help + ps) PS ;; #HELP List containers:\nBOCKER ps + logs) LOGS "$2" ;; #HELP View logs from a container:\nBOCKER logs + commit) COMMIT "$2" "$3" ;; #HELP Commit a container to the image:\nBOCKER commit + rm) RM "$2" ;; #HELP Delete an image or container:\nBOCKER rm + *) HELP $0 ;; #HELP Display this message:\nBOCKER help esac