Establish net/scripts/... for better scoping
This commit is contained in:
parent
97c3125a78
commit
9f413fd656
|
@ -1,8 +1,8 @@
|
||||||
#!/bin/bash -e
|
#!/bin/bash -e
|
||||||
|
|
||||||
here=$(dirname "$0")
|
here=$(dirname "$0")
|
||||||
# shellcheck source=scripts/gcloud.sh
|
# shellcheck source=net/scripts/gcloud.sh
|
||||||
source "$here"/../scripts/gcloud.sh
|
source "$here"/scripts/gcloud.sh
|
||||||
# shellcheck source=net/common.sh
|
# shellcheck source=net/common.sh
|
||||||
source "$here"/common.sh
|
source "$here"/common.sh
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@ if [[ $threadCount -gt 4 ]]; then
|
||||||
threadCount=4
|
threadCount=4
|
||||||
fi
|
fi
|
||||||
|
|
||||||
scripts/install-earlyoom.sh
|
net/scripts/install-earlyoom.sh
|
||||||
|
|
||||||
case $deployMethod in
|
case $deployMethod in
|
||||||
snap)
|
snap)
|
||||||
|
|
|
@ -29,7 +29,7 @@ EOF
|
||||||
source net/common.sh
|
source net/common.sh
|
||||||
loadConfigFile
|
loadConfigFile
|
||||||
|
|
||||||
scripts/install-earlyoom.sh
|
time net/scripts/install-earlyoom.sh
|
||||||
|
|
||||||
if [[ $publicNetwork = true ]]; then
|
if [[ $publicNetwork = true ]]; then
|
||||||
setupArgs="-p"
|
setupArgs="-p"
|
||||||
|
|
Loading…
Reference in New Issue