diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin index c4bf4f61728791349df5d03d5bfe7581a0b43fa5..3966a9947a331afc7d79a725ef30bdcd03ac49aa 100755 --- a/src/freedombone-utils-webadmin +++ b/src/freedombone-utils-webadmin @@ -860,7 +860,7 @@ function web_admin_create_installed_apps_category { if [[ "$app_name" == 'rsync' ]]; then RSYNC_HOSTNAME_ONION=$(cat /var/lib/tor/hidden_service_rsync/hostname) - domain_name="torsocks rsync -avmr $RSYNC_HOSTNAME_ONION::files ~/your_directory/ && torsocks rsync -avmr ~/your_directory/ $RSYNC_HOSTNAME_ONION::files<br><br>rsync -avmr ${PROJECT_NAME}::files ~/your_directory/ && rsync -avmr ~/your_directory/ ${PROJECT_NAME}::files" + domain_name="torsocks rsync -avmr --delete $RSYNC_HOSTNAME_ONION::files ~/your_directory/ && torsocks rsync -avmr --delete ~/your_directory/ $RSYNC_HOSTNAME_ONION::files<br><br>rsync -avmr --delete ${PROJECT_NAME}::files ~/your_directory/ && rsync -avmr --delete ~/your_directory/ ${PROJECT_NAME}::files" fi fi @@ -900,10 +900,19 @@ function web_admin_create_installed_apps_category { if ! grep -q 'SHOW_DOMAIN_IN_WEBADMIN=0' "$app_filename"; then if [ ! -f "$webadmin_install_dir/app_qrcode_${app_name}.png" ]; then - if [ ! -f /usr/local/bin/myqr ]; then - echo -n "http://${onion_domain_name}" | qrencode -t PNG -o "$webadmin_install_dir/app_qrcode_${app_name}.png" + if [[ "$app_name" != 'rsync' ]]; then + if [ ! -f /usr/local/bin/myqr ]; then + echo -n "http://${onion_domain_name}" | qrencode -t PNG -o "$webadmin_install_dir/app_qrcode_${app_name}.png" + else + myqr "http://${onion_domain_name}" -p /root/freedombone/img/onion.png -c -n "$webadmin_install_dir/app_qrcode_${app_name}.png" + fi else - myqr "http://${onion_domain_name}" -p /root/freedombone/img/onion.png -c -n "$webadmin_install_dir/app_qrcode_${app_name}.png" + # do something different for rsync: show the commands to sync + if [ ! -f /usr/local/bin/myqr ]; then + echo -n "torsocks rsync -avmr --delete $RSYNC_HOSTNAME_ONION::files ~/your_directory/ && torsocks rsync -avmr --delete ~/your_directory/ $RSYNC_HOSTNAME_ONION::files" | qrencode -t PNG -o "$webadmin_install_dir/app_qrcode_${app_name}.png" + else + myqr "torsocks rsync -avmr $RSYNC_HOSTNAME_ONION::files ~/your_directory/ && torsocks rsync -avmr ~/your_directory/ $RSYNC_HOSTNAME_ONION::files" -p /root/freedombone/img/onion.png -c -n "$webadmin_install_dir/app_qrcode_${app_name}.png" + fi fi fi fi