From a5b7c7e7f40422b17e5127c4fa3bad7de527261b Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 10 Nov 2015 14:17:08 +0000 Subject: [PATCH] But alas user:add isn't defined in the current owncloud version --- src/freedombone-adduser | 44 ++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/src/freedombone-adduser b/src/freedombone-adduser index 64d2be67..d334df54 100755 --- a/src/freedombone-adduser +++ b/src/freedombone-adduser @@ -226,28 +226,28 @@ if grep -q "install_sip" $COMPLETION_FILE; then fi fi -if grep -q "install_owncloud" $COMPLETION_FILE; then - export OC_PASS="$NEW_USER_PASSWORD" - occ user:add --password-from-env --display-name="$MY_USERNAME" --group="users" $MY_USERNAME - if [ ! "$?" = "0" ]; then - echo 'Owncloud user could not be added' - if grep -q "install_xmpp" $COMPLETION_FILE; then - freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME" - fi - if grep -q "Blog domain" $COMPLETION_FILE; then - if [ -f /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini ]; then - rm /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini - fi - fi - if grep -q "install_sip" $COMPLETION_FILE; then - freedombone-rmsipuser $MY_USERNAME - fi - userdel -r $MY_USERNAME - export OC_PASS="" - exit 11 - fi - export OC_PASS="" -fi +#if grep -q "install_owncloud" $COMPLETION_FILE; then +# export OC_PASS="$NEW_USER_PASSWORD" +# occ user:add --password-from-env --display-name="$MY_USERNAME" --group="users" $MY_USERNAME +# if [ ! "$?" = "0" ]; then +# echo 'Owncloud user could not be added' +# if grep -q "install_xmpp" $COMPLETION_FILE; then +# freedombone-rmxmpp -e "$MY_USERNAME@$HOSTNAME" +# fi +# if grep -q "Blog domain" $COMPLETION_FILE; then +# if [ -f /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini ]; then +# rm /var/www/$FULLBLOG_DOMAIN_NAME/htdocs/config/users/$MY_USERNAME.ini +# fi +# fi +# if grep -q "install_sip" $COMPLETION_FILE; then +# freedombone-rmsipuser $MY_USERNAME +# fi +# userdel -r $MY_USERNAME +# export OC_PASS="" +# exit 11 +# fi +# export OC_PASS="" +#fi clear echo "New user $MY_USERNAME was created"