diff --git a/CHANGELOG.md b/CHANGELOG.md index 5d7ff02..51e3a85 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 2.4.6 2022-08-06 + + ### Added + - Start using custom_scripts and custom_files functions from base + + ## 2.4.5 2022-07-14 ### Added diff --git a/install/etc/cont-init.d/10-coolwsd b/install/etc/cont-init.d/10-coolwsd index 97ba524..a22e77b 100755 --- a/install/etc/cont-init.d/10-coolwsd +++ b/install/etc/cont-init.d/10-coolwsd @@ -61,22 +61,8 @@ if [ -n "${DICTIONARIES}" ]; then silent sudo -u cool /opt/cool/bin/coolwsd-systemplate-setup /opt/cool/systemplate /opt/libreoffice fi -### Custom File Support -if [ -d /assets/custom ] ; then - print_warn "Custom Files Found, Copying over top of Master.." - cp -R /assets/custom/* /opt/cool/share/ - chown -R cool. /opt/cool/share/ -fi - -### Execute Custom Scripts if exist to modify parts of the system -if [ -d /assets/custom-scripts/ ] ; then - print_warn "Found Custom Scripts to Execute" - for f in $(find /assets/custom-scripts/ -name \*.sh -type f); do - print_warn "Running Script ${f}" - chmod +x "${f}" - ${f} - done -fi +custom_files "${CONTAINER_CUSTOM_PATH}" /opt/cool/share/ cool cool +custom_scripts ### Load Custom Fonts if [ -d /assets/custom-fonts/ ] ; then