slaesvuo/hledger
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

install: --force -> --force-install-stack

Browse Source 
[ci skip]
This commit is contained in:
Simon Michael 2018-02-16 22:59:03 -08:00
parent 67fd86f70e
commit dba8eeb390
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
hledger-install/hledger-install.sh
View File

@ -1,17 +1,17 @@
#!/bin/bash -e #!/bin/bash -e
# Easy hledger installation script for POSIX systems. # Easy hledger installation script for POSIX systems.
# Uses cabal if installed and stack is not, # Uses cabal if installed and stack is not,
# or stack, which it will install if needed (or if --force is used). # or stack, which it will install if needed (or if --force-install-stack is used).
# Requires bash and some other POSIX tools. # Requires bash and some other POSIX tools.
# This is based on get-stack.sh which is copyright (c) 2015-2017, Stack contributors. # This is based on get-stack.sh which is copyright (c) 2015-2017, Stack contributors.
usage() { usage() {
cat <<HERE cat <<HERE
hledger-install.sh [-f|--force] [-v|--verbose] [-s|--status] [--version] [-h|--help] hledger-install.sh [-f|--force-install-stack] [-v|--verbose] [-s|--status] [--version] [-h|--help]
Installs the current release of hledger and related tools as reliably and Installs the current release of hledger and related tools as reliably and
quickly as possible on any POSIX system, using cabal (if installed and quickly as possible on any POSIX system, using cabal (if installed and
stack is not) or stack (installing it when needed or if --force is used). stack is not) or stack (installing it when needed or if --force-install-stack is used).
With --status, just lists the currently installed hledger tools. With --status, just lists the currently installed hledger tools.
Usage: Usage:
@ -85,7 +85,7 @@ hledger-irr \
HOME_LOCAL_BIN="$HOME/.local/bin" HOME_LOCAL_BIN="$HOME/.local/bin"
USR_LOCAL_BIN="/usr/local/bin" USR_LOCAL_BIN="/usr/local/bin"
QUIET="" QUIET=""
FORCE="" FORCE_INSTALL_STACK=""
STACK_TEMP_DIR= STACK_TEMP_DIR=
# creates a temporary directory, which will be cleaned up automatically # creates a temporary directory, which will be cleaned up automatically
@ -727,11 +727,11 @@ check_usr_local_bin_on_path() {
# Check whether Stack is already installed, and print an error if it is. # Check whether Stack is already installed, and print an error if it is.
check_stack_installed() { check_stack_installed() {
if [ "$FORCE" != "true" ] && has_stack ; then if [ "$FORCE_INSTALL_STACK" != "true" ] && has_stack ; then
die "Stack $(stack_version) already appears to be installed at: die "Stack $(stack_version) already appears to be installed at:
$(stack_location) $(stack_location)
Use 'stack upgrade' or your OS's package manager to upgrade, Use 'stack upgrade' or your OS's package manager to upgrade,
or pass --force to this script to install anyway." or pass --force-install-stack to this script to install anyway."
fi fi
} }
@ -741,9 +741,9 @@ trap cleanup_temp_dir EXIT
# hledger routines # hledger routines
# install stack if needed, or always with --force, in $HOME/.local/bin # install stack if needed, or always with --force-install-stack, in $HOME/.local/bin
ensure_stack() { ensure_stack() {
if ! $(has_stack) || [[ "$FORCE" == "true" ]] ; then if ! $(has_stack) || [[ "$FORCE_INSTALL_STACK" == "true" ]] ; then
echo "Installing stack" echo "Installing stack"
do_os do_os
fi fi
@ -827,8 +827,8 @@ VERSIONFLAG=""
while [ $# -gt 0 ]; do while [ $# -gt 0 ]; do
case "$1" in case "$1" in
-f|--force) -f|--force-install-stack)
FORCE="true" FORCE_INSTALL_STACK="true"
shift shift
;; ;;
-v|--verbose) -v|--verbose)