From 77c9e21f8233ef6db619cdf6d9c715d70badc78f Mon Sep 17 00:00:00 2001 From: jreeve0805 Date: Sun, 8 Feb 2015 23:15:21 -0500 Subject: [PATCH 1/2] Update freedombone These settings cause PHP to throw an error. Bash can't echo "$conf" because bash isent that smart. I tried to fix this using printf and cat but could not get the result we need. For now this should be removed until someone can fix it. --- src/freedombone | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/freedombone b/src/freedombone index 87ad7d8b..54c1c37f 100755 --- a/src/freedombone +++ b/src/freedombone @@ -6592,19 +6592,19 @@ function install_wiki { sed -i "s/@admin/$MY_USERNAME/g" /etc/dokuwiki/local.php # disallow registration of new users - if ! grep -q "disableactions" /etc/dokuwiki/local.php; then - echo "$conf['disableactions'] = 'register'" >> /etc/dokuwiki/local.php - fi - if ! grep -q "disableactions" /var/lib/dokuwiki/custom/local.php; then - echo "$conf['disableactions'] = 'register';" >> /var/lib/dokuwiki/custom/local.php - fi + #if ! grep -q "disableactions" /etc/dokuwiki/local.php; then + # echo "$conf['disableactions'] = 'register';" >> /etc/dokuwiki/local.php + #fi + #if ! grep -q "disableactions" /var/lib/dokuwiki/custom/local.php; then + # echo "$conf['disableactions'] = 'register';" >> /var/lib/dokuwiki/custom/local.php + #fi - if ! grep -q "authtype" /var/lib/dokuwiki/custom/local.php; then - echo "$conf['authtype'] = 'authplain';" >> /var/lib/dokuwiki/custom/local.php - fi - if ! grep -q "authtype" /etc/dokuwiki/local.php; then - echo "$conf['authtype'] = 'authplain';" >> /etc/dokuwiki/local.php - fi + #if ! grep -q "authtype" /var/lib/dokuwiki/custom/local.php; then + # echo "$conf['authtype'] = 'authplain';" >> /var/lib/dokuwiki/custom/local.php + #fi + #if ! grep -q "authtype" /etc/dokuwiki/local.php; then + # echo "$conf['authtype'] = 'authplain';" >> /etc/dokuwiki/local.php + #fi get_wiki_admin_password if [ ! $WIKI_ADMIN_PASSWORD ]; then From 3efb5eb98ad5a3548891555e41710acdf0c7472d Mon Sep 17 00:00:00 2001 From: jreeve0805 Date: Mon, 9 Feb 2015 11:11:00 -0500 Subject: [PATCH 2/2] Update freedombone Finally found out that using a back slash will allow us to use the $ in a bash script. --- src/freedombone | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/freedombone b/src/freedombone index 54c1c37f..8c8a0d46 100755 --- a/src/freedombone +++ b/src/freedombone @@ -6592,19 +6592,19 @@ function install_wiki { sed -i "s/@admin/$MY_USERNAME/g" /etc/dokuwiki/local.php # disallow registration of new users - #if ! grep -q "disableactions" /etc/dokuwiki/local.php; then - # echo "$conf['disableactions'] = 'register';" >> /etc/dokuwiki/local.php - #fi - #if ! grep -q "disableactions" /var/lib/dokuwiki/custom/local.php; then - # echo "$conf['disableactions'] = 'register';" >> /var/lib/dokuwiki/custom/local.php - #fi + if ! grep -q "disableactions" /etc/dokuwiki/local.php; then + echo "\$conf['disableactions'] = 'register';" >> /etc/dokuwiki/local.php + fi + if ! grep -q "disableactions" /var/lib/dokuwiki/custom/local.php; then + echo "\$conf['disableactions'] = 'register';" >> /var/lib/dokuwiki/custom/local.php + fi - #if ! grep -q "authtype" /var/lib/dokuwiki/custom/local.php; then - # echo "$conf['authtype'] = 'authplain';" >> /var/lib/dokuwiki/custom/local.php - #fi - #if ! grep -q "authtype" /etc/dokuwiki/local.php; then - # echo "$conf['authtype'] = 'authplain';" >> /etc/dokuwiki/local.php - #fi + if ! grep -q "authtype" /var/lib/dokuwiki/custom/local.php; then + echo "\$conf['authtype'] = 'authplain';" >> /var/lib/dokuwiki/custom/local.php + fi + if ! grep -q "authtype" /etc/dokuwiki/local.php; then + echo "\$conf['authtype'] = 'authplain';" >> /etc/dokuwiki/local.php + fi get_wiki_admin_password if [ ! $WIKI_ADMIN_PASSWORD ]; then