diff --git a/src/freedombone-template b/src/freedombone-template index 678751098e415c4f73541b8be47572e50ade8bc0..f602b0bcdea02a314321853e2d8c2c566e07ef2e 100755 --- a/src/freedombone-template +++ b/src/freedombone-template @@ -257,6 +257,7 @@ echo '' echo "VARIANTS='full full-vim'" echo '' echo 'IN_DEFAULT_INSTALL=0' +echo 'INSTALLED_ON_DEFAULT_DOMAIN=0' echo "SHOW_ON_ABOUT=${SHOW_ON_ABOUT}" if [ $app_onion_only ]; then echo 'SHOW_CLEARNET_ADDRESS_ON_ABOUT=0' diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin index 4ce36e8f22b1dcc2f71b3d0f19ca293f01da4525..09a864c38c738ad2dccf0a003fd55031c10b94e4 100755 --- a/src/freedombone-utils-webadmin +++ b/src/freedombone-utils-webadmin @@ -485,10 +485,13 @@ function web_admin_create_installed_apps { sed -i "s|APPNAME|${app_name}|g" "$filename" sed -i "s|ONIONURL|http://${onion_domain_name}|g" "$filename" if [[ "$ONION_ONLY" != 'no' ]]; then - sed -i '/APPURL/d' "$filename" - else - sed -i "s|APPURL|${domain_name}|g" "$filename" + if ! grep -q "INSTALLED_ON_DEFAULT_DOMAIN=1" "$app_filename"; then + if ! grep -q "INSTALLED_ON_DEFAULT_DOMAIN=y" "$app_filename"; then + sed -i '/APPURL/d' "$filename" + fi + fi fi + sed -i "s|APPURL|${domain_name}|g" "$filename" sed -i "s|APPDESCRIPTION|${DESCRIPTION}|g" "$filename" installed_apps_ctr=$((installed_apps_ctr+1))