From 3656d3fbb357b8fc880ab37f830635705854c764 Mon Sep 17 00:00:00 2001 From: Luke Sikina Date: Thu, 25 Jul 2024 07:29:45 -0400 Subject: [PATCH] Export -f doesn't work on all systems --- initial-configuration/install-dependencies-docker.sh | 1 - initial-configuration/mysql-docker/setup.sh | 7 +++++++ initial-configuration/pass.tmp | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 initial-configuration/pass.tmp diff --git a/initial-configuration/install-dependencies-docker.sh b/initial-configuration/install-dependencies-docker.sh index bf8b20a6..ac66304e 100755 --- a/initial-configuration/install-dependencies-docker.sh +++ b/initial-configuration/install-dependencies-docker.sh @@ -8,7 +8,6 @@ sed_inplace() { sed -i "$@" fi } -export -f sed_inplace CWD=$(pwd) # this makes tr work on OSX diff --git a/initial-configuration/mysql-docker/setup.sh b/initial-configuration/mysql-docker/setup.sh index 12ef66db..259088db 100755 --- a/initial-configuration/mysql-docker/setup.sh +++ b/initial-configuration/mysql-docker/setup.sh @@ -1,3 +1,10 @@ +sed_inplace() { + if [ "$(uname)" = "Darwin" ]; then + sed -i '' "$@" + else + sed -i "$@" + fi +} if [ -z "$(docker ps --format '{{.Names}}' | grep picsure-db)" ]; then echo "Cleaning up old configs" rm -r "${DOCKER_CONFIG_DIR:?}"/* diff --git a/initial-configuration/pass.tmp b/initial-configuration/pass.tmp new file mode 100644 index 00000000..db557fe3 --- /dev/null +++ b/initial-configuration/pass.tmp @@ -0,0 +1 @@ +30Ik2r_^Y9CppDHHvmtbGzNf