From 981d688145fde7da6f63b51a4d4d45f3be23e42f Mon Sep 17 00:00:00 2001 From: chamunks <chamunks@gmail.com> Date: Tue, 5 Jun 2018 14:20:51 -0400 Subject: [PATCH] Using cp instead of mv Disabling permissions assertion for now. --- www.spee.ch/docker-entrypoint.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/www.spee.ch/docker-entrypoint.sh b/www.spee.ch/docker-entrypoint.sh index 742f369..d48e070 100755 --- a/www.spee.ch/docker-entrypoint.sh +++ b/www.spee.ch/docker-entrypoint.sh @@ -121,13 +121,13 @@ function configure_speech() { } function final_permset() { - ## Finally reassert permissions in case there is user added drift. - rddo /app "test_for_dir" '775 "speech:speech"' - rfdo /app "test_for_file" '665 "speech:speech"' - ## Define any permission exceptions here. - # test_for_dir /app/config 775 "speech:speech" - # test_for_file /app/config/siteConfig.json 665 "speech:speech" - echof info "Copied Spee.ch and set permissions" + # ## Finally reassert permissions in case there is user added drift. + # rddo /app "test_for_dir" '775 "speech:speech"' + # rfdo /app "test_for_file" '665 "speech:speech"' + # ## Define any permission exceptions here. + # # test_for_dir /app/config 775 "speech:speech" + # # test_for_file /app/config/siteConfig.json 665 "speech:speech" + # echof info "Copied Spee.ch and set permissions" } ################################### @@ -156,8 +156,8 @@ if [ "$(ls -A /app)" ]; then else echof info "Speech not installed, installing fresh copy now." configure_speech - echof run "cp -rv /usr/local/src/www.spee.ch/* /app/" - cp -rv /usr/local/src/www.spee.ch/* /app/ + echof run "cp -r /usr/local/src/www.spee.ch/* /app/" + cp -r /usr/local/src/www.spee.ch/* /app/ final_permset fi