ryuslash/sti
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make the executable name global

Browse source 
Many commands (especially help commands) use them, so get it once and
use everywhere.
This commit is contained in:
Tom Willemse 2014-03-12 17:33:43 +01:00
parent 4141202579
commit 8dc064c4c7
1 changed files with 12 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
sti
View file

@ -15,6 +15,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with sti. If not, see <http://www.gnu.org/licenses/>. # along with sti. If not, see <http://www.gnu.org/licenses/>.
executable_name="$(basename $0)"
data_home="${XDG_DATA_HOME:-${HOME}/.local/share}/sti" data_home="${XDG_DATA_HOME:-${HOME}/.local/share}/sti"
bin_home="${HOME}/usr/bin" bin_home="${HOME}/usr/bin"
@ -27,13 +28,11 @@ function find-executables ()
function help_help { cmd_help "$@"; } function help_help { cmd_help "$@"; }
function cmd_help function cmd_help
{ {
local xname="$(basename $0)"
if [[ -n "$1" ]]; then if [[ -n "$1" ]]; then
local prefix="help" local prefix="help"
dispatch "$@" dispatch "$@"
else else
echo "Usage: $xname <command> ARG" echo "Usage: ${executable_name} <command> ARG"
echo echo
echo "Commands include: " echo "Commands include: "
echo " help Show this help message" echo " help Show this help message"
@ -42,16 +41,14 @@ function cmd_help
echo " reinit Retry installing the executables of a tool" echo " reinit Retry installing the executables of a tool"
echo " remove Remove an installed tool" echo " remove Remove an installed tool"
echo echo
echo "You can use \`$xname help <command>' to get more \ echo "You can use \`${executable_name} help <command>' to get \
information about a command." | fold more information about a command." | fold
fi fi
} }
function help_list () function help_list ()
{ {
local xname="$(basename $0)" echo "Usage: ${executable_name} list"
echo "Usage: ${xname} list"
echo echo
echo "List all downloaded (possibly installed) tools." | fold echo "List all downloaded (possibly installed) tools." | fold
} }
@ -63,13 +60,11 @@ function cmd_list
function help_reinit () function help_reinit ()
{ {
local xname="$(basename $0)" echo "Usage: ${executable_name} reinit TOOL"
echo "Usage: ${xname} reinit TOOL"
echo echo
echo "TOOL should be the name of a tool installed previously with \ echo "TOOL should be the name of a tool installed previously with \
\`${xname} install'. This name is the base name of the URL used to \ \`${executable_name} install'. This name is the base name of the URL \
install the tool, with the \`.git' suffix removed." | fold used to install the tool, with the \`.git' suffix removed." | fold
echo echo
echo "Each executable file found in the tool's directory is checked \ echo "Each executable file found in the tool's directory is checked \
to see if it exists in ${bin_home}, it reports whether it is already \ to see if it exists in ${bin_home}, it reports whether it is already \
@ -100,9 +95,7 @@ ${bin_home}"
function help_install () function help_install ()
{ {
local xname="$(basename $0)" echo "Usage: ${executable_name} install URL"
echo "Usage: ${xname} install URL"
echo echo
echo "URL should be a valid argument to \`git clone'." echo "URL should be a valid argument to \`git clone'."
echo echo
@ -134,13 +127,11 @@ function cmd_install ()
function help_remove () function help_remove ()
{ {
local xname="$(basename $0)" echo "Usage: ${executable_name} remove TOOL"
echo "Usage: ${xname} remove TOOL"
echo echo
echo "TOOL should be the name of a tool installed previously with \ echo "TOOL should be the name of a tool installed previously with \
\`${xname} install'. This name is the base name of the URL used to \ \`${executable_name} install'. This name is the base name of the URL \
install the tool, with the \`.git' suffix removed." | fold used to install the tool, with the \`.git' suffix removed." | fold
echo echo
echo "Any executable files found in the directory of TOOL will have \ echo "Any executable files found in the directory of TOOL will have \
their symlinks in ${bin_home} removed. If a file exists with the same \ their symlinks in ${bin_home} removed. If a file exists with the same \