external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2025-04-20 02:52:11 +00:00
Code Issues Releases Wiki Activity

Fixed merge conflict

Browse Source
This commit is contained in:
Michael Kroes 2019-12-30 07:19:29 +01:00
parent 4908c59430
commit da247707e1
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
setup/webmail.sh
View File

@ -52,15 +52,10 @@ elif [[ "$UPDATE_KEY" != `cat /usr/local/lib/roundcubemail/version` ]]; then
fi fi
if [ $needs_update == 1 ]; then if [ $needs_update == 1 ]; then
# if upgrading from 1.3.x, clear the temp_dir # if upgrading from 1.3.x, clear the temp_dir
<<<<<<< HEAD
if [ "$(cat /usr/local/lib/roundcubemail/version | cut -c1-3)" == '1.3' ]; then
find /var/tmp/roundcubemail/ -type f ! -name 'RCMTEMP*' -delete
=======
if [ -f /usr/local/lib/roundcubemail/version ]; then if [ -f /usr/local/lib/roundcubemail/version ]; then
if [ "$(cat /usr/local/lib/roundcubemail/version | cut -c1-3)" == '1.3' ]; then if [ "$(cat /usr/local/lib/roundcubemail/version | cut -c1-3)" == '1.3' ]; then
find /var/tmp/roundcubemail/ -type f ! -name 'RCMTEMP*' -delete find /var/tmp/roundcubemail/ -type f ! -name 'RCMTEMP*' -delete
fi fi
>>>>>>> upstream/master
fi fi
# install roundcube # install roundcube