Commenting and added another instance of final_permset

This commit is contained in:
chamunks 2018-06-02 18:51:43 -04:00
parent 36b42e2107
commit eee0608eb3

View file

@ -33,18 +33,21 @@ function final_permset() {
if [ "$(ls -A /app)" ]; then if [ "$(ls -A /app)" ]; then
echof warn "/app is not Empty. It contains:" 1>&2 echof warn "/app is not Empty. It contains:" 1>&2
ls -A 1>&2 ls -A 1>&2
## If siteConfig.json isn't installed add it and configure or ignore and proceed.
if [ ! -e '/app/config/siteConfig.json' ]; then if [ ! -e '/app/config/siteConfig.json' ]; then
echof warn "Spee.ch doesn't appear to have a configuration." echof warn "Spee.ch doesn't appear to have a configuration."
echof blank "Don't worry we can install it for you." echof blank "Don't worry we can install it for you."
configure_speech configure_speech
else else
## ## If the file exists skip configuration and proceed.
echof info "Spee.ch config already installed skipping configuration step." echof info "Spee.ch config already installed skipping configuration step."
final_permset final_permset
fi fi
## Install all other files after installing siteConfig.json
echof info "Making an attempt to nicely merge files using:" echof info "Making an attempt to nicely merge files using:"
echof run "mv -fnu /usr/local/src/www.spee.ch/* /app/" echof run "mv -fnu /usr/local/src/www.spee.ch/* /app/"
mv -fnu /usr/local/src/www.spee.ch/* /app/ mv -fnu /usr/local/src/www.spee.ch/* /app/
final_permset
else else
echof info "Speech wasn't installed, installing fresh copy now." echof info "Speech wasn't installed, installing fresh copy now."
configure_speech configure_speech