Check that the confmodule is sourceable before sourcing it
This commit is contained in:
1 parent
eab69bd6d5
commit
79a7342808
4 files changed
+16
-4
No files matched your search
Vendored
+5
-1
@@ -1,6 +1,10 @@
|
|||||||
#!/bin/sh -e
|
#!/bin/bash
|
||||||
|
set -eo pipefail; [[ $TRACE ]] && set -x
|
||||||
|
|
||||||
|
if [[ -e /usr/share/debconf/confmodule ]]; then
|
||||||
|
# shellcheck disable=SC1091
|
||||||
. /usr/share/debconf/confmodule
|
. /usr/share/debconf/confmodule
|
||||||
|
fi
|
||||||
|
|
||||||
readonly ACTION="${1:-configure}"
|
readonly ACTION="${1:-configure}"
|
||||||
readonly VERSION="${2:-dev}"
|
readonly VERSION="${2:-dev}"
|
||||||
|
|||||||
Vendored
+3
@@ -1,7 +1,10 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -eo pipefail; [[ $TRACE ]] && set -x
|
set -eo pipefail; [[ $TRACE ]] && set -x
|
||||||
|
|
||||||
|
if [[ -e /usr/share/debconf/confmodule ]]; then
|
||||||
|
# shellcheck disable=SC1091
|
||||||
. /usr/share/debconf/confmodule
|
. /usr/share/debconf/confmodule
|
||||||
|
fi
|
||||||
|
|
||||||
readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}"
|
readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}"
|
||||||
readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}"
|
readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}"
|
||||||
|
|||||||
Vendored
+5
-3
@@ -1,6 +1,11 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -eo pipefail; [[ $TRACE ]] && set -x
|
set -eo pipefail; [[ $TRACE ]] && set -x
|
||||||
|
|
||||||
|
if [[ -e /usr/share/debconf/confmodule ]]; then
|
||||||
|
# shellcheck disable=SC1091
|
||||||
|
. /usr/share/debconf/confmodule
|
||||||
|
fi
|
||||||
|
|
||||||
readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}"
|
readonly DOKKU_ROOT="${DOKKU_ROOT:-/home/dokku}"
|
||||||
readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}"
|
readonly DOKKU_LIB_ROOT="${DOKKU_LIB_PATH:-/var/lib/dokku}"
|
||||||
|
|
||||||
@@ -35,11 +40,8 @@ main() {
|
|||||||
find ${DOKKU_ROOT} -type d -empty -delete
|
find ${DOKKU_ROOT} -type d -empty -delete
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -e /usr/share/debconf/confmodule ]]; then
|
|
||||||
. /usr/share/debconf/confmodule
|
|
||||||
db_purge
|
db_purge
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
main "$@"
|
main "$@"
|
||||||
Vendored
+3
@@ -1,7 +1,10 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -eo pipefail; [[ $TRACE ]] && set -x
|
set -eo pipefail; [[ $TRACE ]] && set -x
|
||||||
|
|
||||||
|
if [[ -e /usr/share/debconf/confmodule ]]; then
|
||||||
|
# shellcheck disable=SC1091
|
||||||
. /usr/share/debconf/confmodule
|
. /usr/share/debconf/confmodule
|
||||||
|
fi
|
||||||
|
|
||||||
case "$1" in
|
case "$1" in
|
||||||
install)
|
install)
|
||||||
|
|||||||
Reference in new issue
Block a user