瀏覽代碼

Don't use the offline status for patchwork on the mesh

Bob Mottram 7 年之前
父節點
當前提交
f0662e8a57
共有 2 個檔案被更改,包括 19 行新增44 行删除
  1. 0
    25
      src/freedombone-image-customise
  2. 19
    19
      src/freedombone-image-mesh

+ 0
- 25
src/freedombone-image-customise 查看文件

@@ -949,20 +949,9 @@ if [ \$no_of_users -gt 0 ]; then
949 949
         if ! grep -q "\${HOSTNAME}.local" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then
950 950
             sed -i "s|Exec=.*|Exec=$BROWSER http://\${HOSTNAME}.local|g" /home/$MY_USERNAME/Desktop/cryptpad.desktop
951 951
         fi
952
-        if grep -q "Offline" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then
953
-            sed -i 's|Name=.*|Name=CryptPad|g' /home/$MY_USERNAME/Desktop/cryptpad.desktop
954
-        fi
955 952
     fi
956 953
 
957
-    add_social_icon=
958 954
     if [ ! -f /home/$MY_USERNAME/Desktop/social.desktop ]; then
959
-        add_social_icon=1
960
-    else
961
-        if grep -q "Offline" /home/$MY_USERNAME/Desktop/social.desktop; then
962
-            add_social_icon=1
963
-        fi
964
-    fi
965
-    if [ $add_social_icon ]; then
966 955
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
967 956
         echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
968 957
         echo 'Name[el]=Κοινωνικός' >> /home/$MY_USERNAME/Desktop/social.desktop
@@ -1006,10 +995,6 @@ if [ \$no_of_users -gt 0 ]; then
1006 995
     #    echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
1007 996
     #    chmod +x /home/$MY_USERNAME/Desktop/audio.desktop
1008 997
     #    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop
1009
-    #else
1010
-    #    if grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
1011
-    #        sed -i 's|Name=.*|Name=Audio/Music|g' /home/$MY_USERNAME/Desktop/audio.desktop
1012
-    #    fi
1013 998
     #fi
1014 999
 
1015 1000
     if [ ! -f /home/$MY_USERNAME/Desktop/vpn.desktop ]; then
@@ -1204,16 +1189,6 @@ else
1204 1189
         if [ -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then
1205 1190
             rm /home/$MY_USERNAME/Desktop/tox.desktop
1206 1191
         fi
1207
-        if [ -f /home/$MY_USERNAME/Desktop/social.desktop ]; then
1208
-            if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/social.desktop; then
1209
-                sed -i 's|Name=.*|Name=Social (Offline)|g' /home/$MY_USERNAME/Desktop/social.desktop
1210
-            fi
1211
-        fi
1212
-        #if [ -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
1213
-        #    if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
1214
-        #        sed -i 's|Name=.*|Name=Audio/Music (Offline)|g' /home/$MY_USERNAME/Desktop/audio.desktop
1215
-        #    fi
1216
-        #fi
1217 1192
         pkill qtox
1218 1193
     fi
1219 1194
 

+ 19
- 19
src/freedombone-image-mesh 查看文件

@@ -397,36 +397,36 @@ function show_desktop_icons {
397 397
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
398 398
 
399 399
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
400
-    echo 'Name=Social (Offline)' >> /home/$MY_USERNAME/Desktop/social.desktop
401
-    echo "Name[el]=Κοινωνική (εκτός σύνδεσης)" >> /home/$MY_USERNAME/Desktop/social.desktop
402
-    echo "Name[ar]=اجتماعي (غير متصل)" >> /home/$MY_USERNAME/Desktop/social.desktop
403
-    echo "Name[ca]=Social (fora de línia)" >> /home/$MY_USERNAME/Desktop/social.desktop
404
-    echo "Name[hi]=सामाजिक (ऑफ़लाइन)" >> /home/$MY_USERNAME/Desktop/social.desktop
405
-    echo "Name[fr]=Social (Hors ligne)" >> /home/$MY_USERNAME/Desktop/social.desktop
406
-    echo "Name[de]=Soziale (Offline)" >> /home/$MY_USERNAME/Desktop/social.desktop
407
-    echo "Name[es]=Social (sin conexión)" >> /home/$MY_USERNAME/Desktop/social.desktop
408
-    echo "Name[it]=Sociale (offline)" >> /home/$MY_USERNAME/Desktop/social.desktop
409
-    echo "Name[ru]=Социальные (Offline)" >> /home/$MY_USERNAME/Desktop/social.desktop
410
-    echo "Name[zh]=社交(离线)" >> /home/$MY_USERNAME/Desktop/social.desktop
400
+    echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
401
+    echo 'Name[el]=Κοινωνικός' >> /home/$MY_USERNAME/Desktop/social.desktop
402
+    echo 'Name[ar]=اجتماعي' >> /home/$MY_USERNAME/Desktop/social.desktop
403
+    echo 'Name[ca]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
404
+    echo 'Name[hi]=सामाजिक' >> /home/$MY_USERNAME/Desktop/social.desktop
405
+    echo 'Name[fr]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
406
+    echo 'Name[de]=Soziale' >> /home/$MY_USERNAME/Desktop/social.desktop
407
+    echo 'Name[es]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
408
+    echo 'Name[it]=Sociale' >> /home/$MY_USERNAME/Desktop/social.desktop
409
+    echo 'Name[ru]=Социальное' >> /home/$MY_USERNAME/Desktop/social.desktop
410
+    echo 'Name[zh]=社会' >> /home/$MY_USERNAME/Desktop/social.desktop
411 411
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
412
-    echo "Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)" >> /home/$MY_USERNAME/Desktop/social.desktop
413
-    echo "Comment[el]=Μια αποκεντρωμένη εφαρμογή ανταλλαγής μηνυμάτων και κοινής χρήσης που είναι χτισμένη πάνω από το Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
414
-    echo "Comment[ar]=والرسائل اللامركزية وتبادل التطبيق بنيت على رأس سكوتليبوت الآمنة" >> /home/$MY_USERNAME/Desktop/social.desktop
412
+    echo "Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
413
+    echo "Comment[el]=Μια αποκεντρωμένη εφαρμογή ανταλλαγής μηνυμάτων και κοινής χρήσης που είναι ενσωματωμένη στην κορυφή του Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
414
+    echo "Comment[ar]=والرسائل اللامركزية وتبادل التطبيق بنيت على رأس سكوتليبوت الآمنة (سب)" >> /home/$MY_USERNAME/Desktop/social.desktop
415 415
     echo "Comment[ca]=Una aplicació de missatgeria i distribució descentralitzada integrada a Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
416
-    echo "Comment[hi]=सिक्योर स्कूटलबट के शीर्ष पर निर्मित एक विकेन्द्रीकृत संदेश और साझाकरण ऐप" >> /home/$MY_USERNAME/Desktop/social.desktop
416
+    echo "Comment[hi]=सिक्योर स्कूटलबट (एसएसबी) के शीर्ष पर निर्मित एक विकेन्द्रीकृत संदेश और साझाकरण ऐप" >> /home/$MY_USERNAME/Desktop/social.desktop
417 417
     echo "Comment[fr]=Une application de messagerie et de partage décentralisée basée sur Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
418 418
     echo "Comment[de]=Eine dezentralisierte Messaging- und Sharing-App, die auf Secure Scuttlebutt basiert" >> /home/$MY_USERNAME/Desktop/social.desktop
419 419
     echo "Comment[es]=Una aplicación de mensajería y uso compartido descentralizada construida sobre Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
420
-    echo "Comment[it]=Un'applicazione decentrata di messaggistica e condivisione costruita sulla cima di Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
420
+    echo "Comment[it]=Un'applicazione decentralizzata di messaggistica e condivisione costruita sulla base di Secure Shuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
421 421
     echo "Comment[ru]=Децентрализованное приложение для обмена сообщениями и совместного использования, построенное на основе Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
422
-    echo "Comment[zh]=一个分散的消息和共享应用程序建立在安全Scuttlebutt之上" >> /home/$MY_USERNAME/Desktop/social.desktop
422
+    echo "Comment[zh]=安全Scuttlebutt之上构建的分散式消息和共享应用程序" >> /home/$MY_USERNAME/Desktop/social.desktop
423 423
     echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
424
-    echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop
424
+    echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop
425 425
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop
426 426
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop
427 427
 
428 428
     #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
429
-    #echo 'Name=Audio/Music (Offline)' >> /home/$MY_USERNAME/Desktop/audio.desktop
429
+    #echo 'Name=Audio/Music' >> /home/$MY_USERNAME/Desktop/audio.desktop
430 430
     #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
431 431
     #echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
432 432
     #echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop