mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
Merge remote-tracking branch 'origin/dev' into helpers-2.1
This commit is contained in:
commit
6835a664c7
1 changed files with 2 additions and 8 deletions
|
@ -2,14 +2,8 @@
|
|||
# Entrypoint for the helpers scripts
|
||||
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
|
||||
|
||||
if [[ -n "${1:-}" ]]; then
|
||||
# helpers version can be passed as first when sourcing.
|
||||
YNH_HELPERS_VERSION="$1"
|
||||
else
|
||||
# ...or as environment variable set from manifest
|
||||
# ...or default to 1
|
||||
# Helpers version can be specified via an environment variable or default to 1.
|
||||
YNH_HELPERS_VERSION=${YNH_HELPERS_VERSION:-1}
|
||||
fi
|
||||
|
||||
# This is a trick to later only restore set -x if it was set when calling this script
|
||||
readonly XTRACE_ENABLE=$(set +o | grep xtrace)
|
||||
|
|
Loading…
Add table
Reference in a new issue