Merge pull request #22 from linuxserver/ini-grep-fix

removed -x option since we are just looking for the directive, not ex…
This commit is contained in:
aptalca 2020-09-18 12:20:20 -04:00 committed by GitHub
commit fbfb7bd3ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -25,20 +25,20 @@ CORE_DIR=(\
mkdir -p /config/dokuwiki/lib/
## Move user folders to persistent storage
for i in "${USER_DIRECTORY[@]}"; do
for i in "${USER_DIRECTORY[@]}"; do
[[ ! -d /config/dokuwiki/${i} ]] && \
[[ -d /app/dokuwiki/"${i}" ]] && \
mv /app/dokuwiki/"${i}" /config/dokuwiki/"${i}"/
done
## Remove user folders
for i in "${USER_DIRECTORY[@]}"; do
for i in "${USER_DIRECTORY[@]}"; do
[[ -d /app/dokuwiki/"${i}" ]] && \
rm -rf /app/dokuwiki/"${i}"
done
## Make Symlinks
for i in "${USER_DIRECTORY[@]}"; do
for i in "${USER_DIRECTORY[@]}"; do
[[ ! -L /app/dokuwiki/"${i}" ]] && \
ln -s /config/dokuwiki/"${i}" /app/dokuwiki/"${i}"
done
@ -52,8 +52,8 @@ for i in "${CORE_DIR[@]}"; do
done
## Bump php upload max filesize and post max size to 100MB by default
grep -qxF 'upload_max_filesize' /config/php/php-local.ini || echo 'upload_max_filesize = 100MB' >> /config/php/php-local.ini
grep -qxF 'post_max_size' /config/php/php-local.ini || echo 'post_max_size = 100MB' >> /config/php/php-local.ini
grep -qF 'upload_max_filesize' /config/php/php-local.ini || echo 'upload_max_filesize = 100MB' >> /config/php/php-local.ini
grep -qF 'post_max_size' /config/php/php-local.ini || echo 'post_max_size = 100MB' >> /config/php/php-local.ini
## Remove install.php once setup & enable pretty urls to work after setting .htaccess method in admin panel.
if [[ -f /config/dokuwiki/conf/local.php ]]; then