From f0662e8a575809bee457c49ff594ab40bea22723 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sun, 29 Oct 2017 18:21:03 +0000 Subject: [PATCH] Don't use the offline status for patchwork on the mesh --- src/freedombone-image-customise | 25 ---------------------- src/freedombone-image-mesh | 38 ++++++++++++++++----------------- 2 files changed, 19 insertions(+), 44 deletions(-) diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise index 6468cb12..bf926927 100755 --- a/src/freedombone-image-customise +++ b/src/freedombone-image-customise @@ -949,20 +949,9 @@ if [ \$no_of_users -gt 0 ]; then if ! grep -q "\${HOSTNAME}.local" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then sed -i "s|Exec=.*|Exec=$BROWSER http://\${HOSTNAME}.local|g" /home/$MY_USERNAME/Desktop/cryptpad.desktop fi - if grep -q "Offline" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then - sed -i 's|Name=.*|Name=CryptPad|g' /home/$MY_USERNAME/Desktop/cryptpad.desktop - fi fi - add_social_icon= if [ ! -f /home/$MY_USERNAME/Desktop/social.desktop ]; then - add_social_icon=1 - else - if grep -q "Offline" /home/$MY_USERNAME/Desktop/social.desktop; then - add_social_icon=1 - fi - fi - if [ $add_social_icon ]; then echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Name[el]=Κοινωνικός' >> /home/$MY_USERNAME/Desktop/social.desktop @@ -1006,10 +995,6 @@ if [ \$no_of_users -gt 0 ]; then # echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop # chmod +x /home/$MY_USERNAME/Desktop/audio.desktop # chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop - #else - # if grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then - # sed -i 's|Name=.*|Name=Audio/Music|g' /home/$MY_USERNAME/Desktop/audio.desktop - # fi #fi if [ ! -f /home/$MY_USERNAME/Desktop/vpn.desktop ]; then @@ -1204,16 +1189,6 @@ else if [ -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then rm /home/$MY_USERNAME/Desktop/tox.desktop fi - if [ -f /home/$MY_USERNAME/Desktop/social.desktop ]; then - if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/social.desktop; then - sed -i 's|Name=.*|Name=Social (Offline)|g' /home/$MY_USERNAME/Desktop/social.desktop - fi - fi - #if [ -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then - # if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then - # sed -i 's|Name=.*|Name=Audio/Music (Offline)|g' /home/$MY_USERNAME/Desktop/audio.desktop - # fi - #fi pkill qtox fi diff --git a/src/freedombone-image-mesh b/src/freedombone-image-mesh index 10e58f4d..cb3a6183 100755 --- a/src/freedombone-image-mesh +++ b/src/freedombone-image-mesh @@ -397,36 +397,36 @@ function show_desktop_icons { echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop - echo 'Name=Social (Offline)' >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Name[el]=Κοινωνική (εκτός σύνδεσης)" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Name[ar]=اجتماعي (غير متصل)" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Name[ca]=Social (fora de línia)" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Name[hi]=सामाजिक (ऑफ़लाइन)" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Name[fr]=Social (Hors ligne)" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Name[de]=Soziale (Offline)" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Name[es]=Social (sin conexión)" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Name[it]=Sociale (offline)" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Name[ru]=Социальные (Offline)" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Name[zh]=社交（离线）" >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[el]=Κοινωνικός' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[ar]=اجتماعي' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[ca]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[hi]=सामाजिक' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[fr]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[de]=Soziale' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[es]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[it]=Sociale' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[ru]=Социальное' >> /home/$MY_USERNAME/Desktop/social.desktop + echo 'Name[zh]=社会' >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Comment[el]=Μια αποκεντρωμένη εφαρμογή ανταλλαγής μηνυμάτων και κοινής χρήσης που είναι χτισμένη πάνω από το Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Comment[ar]=والرسائل اللامركزية وتبادل التطبيق بنيت على رأس سكوتليبوت الآمنة" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[el]=Μια αποκεντρωμένη εφαρμογή ανταλλαγής μηνυμάτων και κοινής χρήσης που είναι ενσωματωμένη στην κορυφή του Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[ar]=والرسائل اللامركزية وتبادل التطبيق بنيت على رأس سكوتليبوت الآمنة (سب)" >> /home/$MY_USERNAME/Desktop/social.desktop echo "Comment[ca]=Una aplicació de missatgeria i distribució descentralitzada integrada a Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Comment[hi]=सिक्योर स्कूटलबट के शीर्ष पर निर्मित एक विकेन्द्रीकृत संदेश और साझाकरण ऐप" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[hi]=सिक्योर स्कूटलबट (एसएसबी) के शीर्ष पर निर्मित एक विकेन्द्रीकृत संदेश और साझाकरण ऐप" >> /home/$MY_USERNAME/Desktop/social.desktop echo "Comment[fr]=Une application de messagerie et de partage décentralisée basée sur Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop echo "Comment[de]=Eine dezentralisierte Messaging- und Sharing-App, die auf Secure Scuttlebutt basiert" >> /home/$MY_USERNAME/Desktop/social.desktop echo "Comment[es]=Una aplicación de mensajería y uso compartido descentralizada construida sobre Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Comment[it]=Un'applicazione decentrata di messaggistica e condivisione costruita sulla cima di Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[it]=Un'applicazione decentralizzata di messaggistica e condivisione costruita sulla base di Secure Shuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop echo "Comment[ru]=Децентрализованное приложение для обмена сообщениями и совместного использования, построенное на основе Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Comment[zh]=一个分散的消息和共享应用程序建立在安全Scuttlebutt之上" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Comment[zh]=安全Scuttlebutt之上构建的分散式消息和共享应用程序" >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop - echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop + echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop - #echo 'Name=Audio/Music (Offline)' >> /home/$MY_USERNAME/Desktop/audio.desktop + #echo 'Name=Audio/Music' >> /home/$MY_USERNAME/Desktop/audio.desktop #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop #echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop #echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop