Browse Source

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram 7 years ago
parent
commit
51bc88f869

+ 3
- 3
doc/EN/mesh_images.org View File

45
 wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig
45
 wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig
46
 gpg --verify freedombone-meshclient-i386.img.xz.sig
46
 gpg --verify freedombone-meshclient-i386.img.xz.sig
47
 sha256sum freedombone-meshclient-i386.img.xz
47
 sha256sum freedombone-meshclient-i386.img.xz
48
-61e474afae14774d7aa479b6727fd5e77bdc1854e547b3c5b630bf10542a9581
48
+6dcf7418d6bd7dbe79f5fcf96f83b48eb59f6c11a50b67c5e2c013195751989e
49
 unxz freedombone-meshclient-i386.img.xz
49
 unxz freedombone-meshclient-i386.img.xz
50
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
50
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
51
 sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync
51
 sudo dd bs=1M if=freedombone-meshclient-i386.img of=/dev/sdX conv=fdatasync
61
 wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig
61
 wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig
62
 gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig
62
 gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig
63
 sha256sum freedombone-meshclient-insecure-i386.img.xz
63
 sha256sum freedombone-meshclient-insecure-i386.img.xz
64
-fec843303d7d280859f75f7a8edccd70512915a34d4cc0787b5de7d8fbde5c81
64
+4e9ee5fc5aa11fa58bcceae7f04f017c005a4a2595c0d64ac49de39f88b6590d
65
 unxz freedombone-meshclient-insecure-i386.img.xz
65
 unxz freedombone-meshclient-insecure-i386.img.xz
66
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
66
 sudo dd if=/dev/zero of=/dev/sdX bs=1M count=8
67
 sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync
67
 sudo dd bs=1M if=freedombone-meshclient-insecure-i386.img of=/dev/sdX conv=fdatasync
102
 wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig
102
 wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig
103
 gpg --verify freedombone.tar.gz.sig
103
 gpg --verify freedombone.tar.gz.sig
104
 sha256sum freedombone.tar.gz
104
 sha256sum freedombone.tar.gz
105
-e2715e27b142a21fa257eab15778ddc96f86fda70f8d91d47c4c9aa19f22e272
105
+024aedd3a264e963d791daaada347aba1295bc5caebba34ad9b19dc117a8cac9
106
 tar -xzvf freedombone.tar.gz
106
 tar -xzvf freedombone.tar.gz
107
 cd freedombone
107
 cd freedombone
108
 git checkout stretch
108
 git checkout stretch

img/icons_chat.png → img/avatars/icon_chat.png View File


img/icons_invite.png → img/avatars/icon_invite.png View File


BIN
img/avatars/icon_sites.png View File


BIN
img/avatars/icons_chat.png View File


BIN
img/icon_chat.png View File


img/avatars/icons_invite.png → img/icon_invite.png View File


BIN
img/icon_sites.png View File


BIN
img/mesh_choose_avatar.jpg View File


BIN
img/mesh_connect.jpg View File


BIN
img/mesh_cryptpad1.jpg View File


BIN
img/mesh_cryptpad2.jpg View File


BIN
img/mesh_friend_request.jpg View File


BIN
img/mesh_netbook.jpg View File


BIN
img/mesh_new_blog.jpg View File


BIN
img/mesh_new_blog2.jpg View File


BIN
img/mesh_share_files.jpg View File


BIN
img/mesh_signal.jpg View File


BIN
img/mesh_text_chat.jpg View File


BIN
img/mesh_view_blog.jpg View File


BIN
img/mesh_visit_site.jpg View File


BIN
img/patchwork_public.jpg View File


BIN
img/patchwork_setup.jpg View File


+ 0
- 4
src/freedombone-app-cryptpad View File

234
         exit 783251
234
         exit 783251
235
     fi
235
     fi
236
 
236
 
237
-    if [ -f $rootdir/root/$PROJECT_NAME/img/icon_cryptpad.png ]; then
238
-        cp $rootdir/root/$PROJECT_NAME/img/icon_cryptpad.png $rootdir$CRYPTPAD_DIR/icon_cryptpad.png
239
-    fi
240
-
241
     # an unprivileged user to run as
237
     # an unprivileged user to run as
242
     chroot "$rootdir" useradd -d $CRYPTPAD_DIR/ cryptpad
238
     chroot "$rootdir" useradd -d $CRYPTPAD_DIR/ cryptpad
243
 
239
 

+ 0
- 4
src/freedombone-app-scuttlebot View File

197
 }
197
 }
198
 
198
 
199
 function mesh_install_scuttlebot {
199
 function mesh_install_scuttlebot {
200
-    if [[ $VARIANT == "mesh" ]]; then
201
-        return
202
-    fi
203
-
204
     cat <<EOF > $rootdir/usr/bin/install_scuttlebot
200
     cat <<EOF > $rootdir/usr/bin/install_scuttlebot
205
 #!/bin/bash
201
 #!/bin/bash
206
 npm install -g scuttlebot@${SCUTTLEBOT_VERSION}
202
 npm install -g scuttlebot@${SCUTTLEBOT_VERSION}

+ 148
- 39
src/freedombone-image-customise View File

773
     echo '' >> $START_DESKTOP
773
     echo '' >> $START_DESKTOP
774
     echo '' >> $START_DESKTOP
774
     echo '' >> $START_DESKTOP
775
     echo "if [ ! -f $FIRST_BOOT ]; then" >> $START_DESKTOP
775
     echo "if [ ! -f $FIRST_BOOT ]; then" >> $START_DESKTOP
776
-    echo "  $TAHOE_COMMAND start" >> $START_DESKTOP
776
+    echo '  if [ -d /var/lib/tahoelafs ]; then' >> $START_DESKTOP
777
+    echo "    $TAHOE_COMMAND start" >> $START_DESKTOP
778
+    echo '  fi' >> $START_DESKTOP
777
     echo '  exit 0' >> $START_DESKTOP
779
     echo '  exit 0' >> $START_DESKTOP
778
     echo 'fi' >> $START_DESKTOP
780
     echo 'fi' >> $START_DESKTOP
779
     echo '' >> $START_DESKTOP
781
     echo '' >> $START_DESKTOP
806
     echo "Exec=bash -c '~/mesh-desktop.sh'" >> $START_DESKTOP2
808
     echo "Exec=bash -c '~/mesh-desktop.sh'" >> $START_DESKTOP2
807
     echo 'X-GNOME-Autostart-enabled=true' >> $START_DESKTOP2
809
     echo 'X-GNOME-Autostart-enabled=true' >> $START_DESKTOP2
808
     chmod +x $START_DESKTOP2
810
     chmod +x $START_DESKTOP2
809
-
810
-    START_DESKTOP3=$rootdir/home/$MY_USERNAME/.config/autostart/set_username.desktop
811
-    echo '[Desktop Entry]' > $START_DESKTOP3
812
-    echo 'Version=1.0' >> $START_DESKTOP3
813
-    echo 'Name=Set Username' >> $START_DESKTOP3
814
-    echo 'Type=Application' >> $START_DESKTOP3
815
-    echo 'Comment=Set username' >> $START_DESKTOP3
816
-    echo "Exec=mate-terminal -e \"bash -c /home/${MY_USERNAME}/mesh-desktop.sh\"" >> $START_DESKTOP3
817
-    echo 'Icon=user-away' >> $START_DESKTOP3
818
-    echo 'Terminal=false' >> $START_DESKTOP3
819
-    echo 'Categories=Application;' >> $START_DESKTOP3
820
-    chmod +x $START_DESKTOP3
821
 }
811
 }
822
 
812
 
823
 function mesh_desktop_icons {
813
 function mesh_desktop_icons {
918
     fi
908
     fi
919
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/Users.desktop
909
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/Users.desktop
920
     echo 'Comment=List of users' >> /home/$MY_USERNAME/Desktop/Users.desktop
910
     echo 'Comment=List of users' >> /home/$MY_USERNAME/Desktop/Users.desktop
911
+    echo 'Comment[el]=Κατάλογος χρηστών' >> /home/$MY_USERNAME/Desktop/Users.desktop
912
+    echo 'Comment[ar]=قائمة المستخدمين' >> /home/$MY_USERNAME/Desktop/Users.desktop
913
+    echo "Comment[ca]=Llista d'usuaris" >> /home/$MY_USERNAME/Desktop/Users.desktop
914
+    echo 'Comment[hi]=उपयोगकर्ताओं की सूची' >> /home/$MY_USERNAME/Desktop/Users.desktop
915
+    echo 'Comment[fr]=Liste des utilisateurs' >> /home/$MY_USERNAME/Desktop/Users.desktop
916
+    echo 'Comment[de]=Liste der Benutzer' >> /home/$MY_USERNAME/Desktop/Users.desktop
917
+    echo 'Comment[es]=Lista de usuarios' >> /home/$MY_USERNAME/Desktop/Users.desktop
918
+    echo 'Comment[it]=Elenco degli utenti' >> /home/$MY_USERNAME/Desktop/Users.desktop
919
+    echo 'Comment[ru]=Список пользователей' >> /home/$MY_USERNAME/Desktop/Users.desktop
920
+    echo 'Comment[zh]=用户列表' >> /home/$MY_USERNAME/Desktop/Users.desktop
921
     echo 'Exec=bash /home/$MY_USERNAME/showusers' >> /home/$MY_USERNAME/Desktop/Users.desktop
921
     echo 'Exec=bash /home/$MY_USERNAME/showusers' >> /home/$MY_USERNAME/Desktop/Users.desktop
922
     echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_users.png' >> /home/$MY_USERNAME/Desktop/Users.desktop
922
     echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_users.png' >> /home/$MY_USERNAME/Desktop/Users.desktop
923
     echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/Users.desktop
923
     echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/Users.desktop
929
         echo 'Name=CryptPad' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
929
         echo 'Name=CryptPad' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
930
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
930
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
931
         echo 'Comment=Realtime collaborative editing of documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
931
         echo 'Comment=Realtime collaborative editing of documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
932
+        echo 'Comment[el]=Συνεργατική επεξεργασία εγγράφων σε πραγματικό χρόνο' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
933
+        echo 'Comment[ar]=في الوقت الحقيقي التحرير التعاوني للوثائق' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
934
+        echo 'Comment[ca]=Edició col·laborativa en temps real de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
935
+        echo 'Comment[hi]=दस्तावेज़ों का रीयलटाइम सहयोगी संपादन' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
936
+        echo 'Comment[fr]=Edition collaborative en temps réel de documents' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
937
+        echo 'Comment[de]=Kollaboratives Echtzeit-Editing von Dokumenten' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
938
+        echo 'Comment[es]=Edición colaborativa en tiempo real de documentos' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
939
+        echo 'Comment[it]=Editing collaborativo di documenti in tempo reale' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
940
+        echo 'Comment[ru]=Совместное редактирование документов в режиме реального времени' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
941
+        echo 'Comment[zh]=实时协同编辑文件' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
932
         echo "Exec=$BROWSER http://\${HOSTNAME}.local" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
942
         echo "Exec=$BROWSER http://\${HOSTNAME}.local" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
933
         echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_cryptpad.png" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
943
         echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_cryptpad.png" >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
934
         echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
944
         echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/cryptpad.desktop
939
         if ! grep -q "\${HOSTNAME}.local" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then
949
         if ! grep -q "\${HOSTNAME}.local" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then
940
             sed -i "s|Exec=.*|Exec=$BROWSER http://\${HOSTNAME}.local|g" /home/$MY_USERNAME/Desktop/cryptpad.desktop
950
             sed -i "s|Exec=.*|Exec=$BROWSER http://\${HOSTNAME}.local|g" /home/$MY_USERNAME/Desktop/cryptpad.desktop
941
         fi
951
         fi
942
-        if grep -q "Offline" /home/$MY_USERNAME/Desktop/cryptpad.desktop; then
943
-            sed -i 's|Name=.*|Name=CryptPad|g' /home/$MY_USERNAME/Desktop/cryptpad.desktop
944
-        fi
945
     fi
952
     fi
946
 
953
 
947
     if [ ! -f /home/$MY_USERNAME/Desktop/social.desktop ]; then
954
     if [ ! -f /home/$MY_USERNAME/Desktop/social.desktop ]; then
948
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
955
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
949
         echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
956
         echo 'Name=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
957
+        echo 'Name[el]=Κοινωνικός' >> /home/$MY_USERNAME/Desktop/social.desktop
958
+        echo 'Name[ar]=اجتماعي' >> /home/$MY_USERNAME/Desktop/social.desktop
959
+        echo 'Name[ca]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
960
+        echo 'Name[hi]=सामाजिक' >> /home/$MY_USERNAME/Desktop/social.desktop
961
+        echo 'Name[fr]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
962
+        echo 'Name[de]=Soziale' >> /home/$MY_USERNAME/Desktop/social.desktop
963
+        echo 'Name[es]=Social' >> /home/$MY_USERNAME/Desktop/social.desktop
964
+        echo 'Name[it]=Sociale' >> /home/$MY_USERNAME/Desktop/social.desktop
965
+        echo 'Name[ru]=Социальное' >> /home/$MY_USERNAME/Desktop/social.desktop
966
+        echo 'Name[zh]=社会' >> /home/$MY_USERNAME/Desktop/social.desktop
950
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
967
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
951
-        echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> /home/$MY_USERNAME/Desktop/social.desktop
968
+        echo "Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
969
+        echo "Comment[el]=Μια αποκεντρωμένη εφαρμογή ανταλλαγής μηνυμάτων και κοινής χρήσης που είναι ενσωματωμένη στην κορυφή του Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
970
+        echo "Comment[ar]=والرسائل اللامركزية وتبادل التطبيق بنيت على رأس سكوتليبوت الآمنة (سب)" >> /home/$MY_USERNAME/Desktop/social.desktop
971
+        echo "Comment[ca]=Una aplicació de missatgeria i distribució descentralitzada integrada a Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
972
+        echo "Comment[hi]=सिक्योर स्कूटलबट (एसएसबी) के शीर्ष पर निर्मित एक विकेन्द्रीकृत संदेश और साझाकरण ऐप" >> /home/$MY_USERNAME/Desktop/social.desktop
973
+        echo "Comment[fr]=Une application de messagerie et de partage décentralisée basée sur Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
974
+        echo "Comment[de]=Eine dezentralisierte Messaging- und Sharing-App, die auf Secure Scuttlebutt basiert" >> /home/$MY_USERNAME/Desktop/social.desktop
975
+        echo "Comment[es]=Una aplicación de mensajería y uso compartido descentralizada construida sobre Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
976
+        echo "Comment[it]=Un'applicazione decentralizzata di messaggistica e condivisione costruita sulla base di Secure Shuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
977
+        echo "Comment[ru]=Децентрализованное приложение для обмена сообщениями и совместного использования, построенное на основе Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
978
+        echo "Comment[zh]=安全Scuttlebutt之上构建的分散式消息和共享应用程序" >> /home/$MY_USERNAME/Desktop/social.desktop
952
         echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
979
         echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
953
         echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop
980
         echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_social.png" >> /home/$MY_USERNAME/Desktop/social.desktop
954
         echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop
981
         echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop
955
         echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop
982
         echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop
956
         chmod +x /home/$MY_USERNAME/Desktop/social.desktop
983
         chmod +x /home/$MY_USERNAME/Desktop/social.desktop
957
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/social.desktop
984
         chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/social.desktop
958
-    else
959
-        if grep -q "Offline" /home/$MY_USERNAME/Desktop/social.desktop; then
960
-            sed -i 's|Name=.*|Name=Social|g' /home/$MY_USERNAME/Desktop/social.desktop
961
-        fi
962
     fi
985
     fi
963
 
986
 
964
     #if [ ! -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
987
     #if [ ! -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
972
     #    echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
995
     #    echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/audio.desktop
973
     #    chmod +x /home/$MY_USERNAME/Desktop/audio.desktop
996
     #    chmod +x /home/$MY_USERNAME/Desktop/audio.desktop
974
     #    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop
997
     #    chown $MY_USERNAME:$MY_USERNAME /home/$MY_USERNAME/Desktop/audio.desktop
975
-    #else
976
-    #    if grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
977
-    #        sed -i 's|Name=.*|Name=Audio/Music|g' /home/$MY_USERNAME/Desktop/audio.desktop
978
-    #    fi
979
     #fi
998
     #fi
980
 
999
 
981
     if [ ! -f /home/$MY_USERNAME/Desktop/vpn.desktop ]; then
1000
     if [ ! -f /home/$MY_USERNAME/Desktop/vpn.desktop ]; then
982
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/vpn.desktop
1001
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/vpn.desktop
983
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1002
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/vpn.desktop
984
         echo 'Name=Connect Meshes' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1003
         echo 'Name=Connect Meshes' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1004
+        echo 'Name[el]=Συνδέστε τα μάτια' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1005
+        echo 'Name[ar]=ربط مشيس' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1006
+        echo 'Name[ca]=Connecteu malles' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1007
+        echo 'Name[hi]=कनेक्ट मेशेस' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1008
+        echo 'Name[fr]=Connecter les maillages' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1009
+        echo 'Name[de]=Netze verbinden' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1010
+        echo 'Name[es]=Conectar Mallas' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1011
+        echo 'Name[it]=Collegare le maglie' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1012
+        echo 'Name[ru]=Подключить сетки' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1013
+        echo 'Name[zh]=连接网格' >> /home/$MY_USERNAME/Desktop/vpn.desktop
985
         echo 'Comment=Connect to another mesh network via the internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1014
         echo 'Comment=Connect to another mesh network via the internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
986
-        echo 'Exec=mate-terminal -e /usr/local/bin/${PROJECT_NAME}-mesh-connect' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1015
+        echo 'Comment[el]=Συνδεθείτε σε άλλο δίκτυο ματιών μέσω του Διαδικτύου' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1016
+        echo 'Comment[ar]=الاتصال بشبكة شبكة أخرى عبر الإنترنت' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1017
+        echo "Comment[ca]=Connecteu-vos a una altra xarxa de malla a través d'Internet" >> /home/$MY_USERNAME/Desktop/vpn.desktop
1018
+        echo 'Comment[hi]=इंटरनेट के माध्यम से किसी अन्य जाल नेटवर्क से कनेक्ट करें' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1019
+        echo 'Comment[fr]=Connectez-vous à un autre réseau maillé via Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1020
+        echo 'Comment[de]=Verbindung mit einem anderen Mesh-Netzwerk über das Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1021
+        echo 'Comment[es]=Conéctese a otra red en malla a través de Internet' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1022
+        echo "Comment[it]=Collegarsi ad un'altra rete di maglie via internet" >> /home/$MY_USERNAME/Desktop/vpn.desktop
1023
+        echo 'Comment[ru]=Подключение к другой сети с сетью через Интернет' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1024
+        echo 'Comment[zh]=通过互联网连接到另一个网状网络' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1025
+        echo 'Exec=mate-terminal --full-screen -e /usr/local/bin/${PROJECT_NAME}-mesh-connect' >> /home/$MY_USERNAME/Desktop/vpn.desktop
987
         echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_connect.png' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1026
         echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_connect.png' >> /home/$MY_USERNAME/Desktop/vpn.desktop
988
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/vpn.desktop
1027
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/vpn.desktop
989
         chmod +x /home/$MY_USERNAME/Desktop/vpn.desktop
1028
         chmod +x /home/$MY_USERNAME/Desktop/vpn.desktop
994
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop
1033
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/sites.desktop
995
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/sites.desktop
1034
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/sites.desktop
996
         echo "Name=Visit a site" >> /home/$MY_USERNAME/Desktop/sites.desktop
1035
         echo "Name=Visit a site" >> /home/$MY_USERNAME/Desktop/sites.desktop
1036
+        echo "Name[el]=Επισκεφθείτε έναν ιστότοπο" >> /home/$MY_USERNAME/Desktop/sites.desktop
1037
+        echo "Name[ar]=انتقل إلى موقع" >> /home/$MY_USERNAME/Desktop/sites.desktop
1038
+        echo "Name[ca]=Visiteu un lloc" >> /home/$MY_USERNAME/Desktop/sites.desktop
1039
+        echo "Name[hi]=किसी साइट पर जाएं" >> /home/$MY_USERNAME/Desktop/sites.desktop
1040
+        echo "Name[fr]=Visitez un site" >> /home/$MY_USERNAME/Desktop/sites.desktop
1041
+        echo "Name[de]=Besuchen Sie eine Website" >> /home/$MY_USERNAME/Desktop/sites.desktop
1042
+        echo "Name[es]=Visita un sitio" >> /home/$MY_USERNAME/Desktop/sites.desktop
1043
+        echo "Name[it]=Visita un sito" >> /home/$MY_USERNAME/Desktop/sites.desktop
1044
+        echo "Name[ru]=Посетите сайт" >> /home/$MY_USERNAME/Desktop/sites.desktop
1045
+        echo "Name[zh]=访问网站" >> /home/$MY_USERNAME/Desktop/sites.desktop
997
         echo 'Comment=Visit a site' >> /home/$MY_USERNAME/Desktop/sites.desktop
1046
         echo 'Comment=Visit a site' >> /home/$MY_USERNAME/Desktop/sites.desktop
998
-        echo 'Exec=mate-terminal -e /usr/local/bin/${PROJECT_NAME}-mesh-visit-site' >> /home/$MY_USERNAME/Desktop/sites.desktop
1047
+        echo "Comment[el]=Επισκεφθείτε έναν ιστότοπο" >> /home/$MY_USERNAME/Desktop/sites.desktop
1048
+        echo "Comment[ar]=انتقل إلى موقع" >> /home/$MY_USERNAME/Desktop/sites.desktop
1049
+        echo "Commant[ca]=Visiteu un lloc" >> /home/$MY_USERNAME/Desktop/sites.desktop
1050
+        echo "Comment[hi]=किसी साइट पर जाएं" >> /home/$MY_USERNAME/Desktop/sites.desktop
1051
+        echo "Comment[fr]=Visitez un site" >> /home/$MY_USERNAME/Desktop/sites.desktop
1052
+        echo "Comment[de]=Besuchen Sie eine Website" >> /home/$MY_USERNAME/Desktop/sites.desktop
1053
+        echo "Comment[es]=Visita un sitio" >> /home/$MY_USERNAME/Desktop/sites.desktop
1054
+        echo "Comment[it]=Visita un sito" >> /home/$MY_USERNAME/Desktop/sites.desktop
1055
+        echo "Comment[ru]=Посетите сайт" >> /home/$MY_USERNAME/Desktop/sites.desktop
1056
+        echo "Comment[zh]=访问网站" >> /home/$MY_USERNAME/Desktop/sites.desktop
1057
+        echo 'Exec=mate-terminal --full-screen -e /usr/local/bin/${PROJECT_NAME}-mesh-visit-site' >> /home/$MY_USERNAME/Desktop/sites.desktop
999
         echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_sites.png' >> /home/$MY_USERNAME/Desktop/sites.desktop
1058
         echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_sites.png' >> /home/$MY_USERNAME/Desktop/sites.desktop
1000
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/sites.desktop
1059
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/sites.desktop
1001
         chmod +x /home/$MY_USERNAME/Desktop/sites.desktop
1060
         chmod +x /home/$MY_USERNAME/Desktop/sites.desktop
1004
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/blog.desktop
1063
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/blog.desktop
1005
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/blog.desktop
1064
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/blog.desktop
1006
         echo "Name=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1065
         echo "Name=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1066
+        echo "Name[el]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1067
+        echo "Name[ar]=مدونة" >> /home/$MY_USERNAME/Desktop/blog.desktop
1068
+        echo "Name[ca]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1069
+        echo "Name[hi]=ब्लॉग" >> /home/$MY_USERNAME/Desktop/blog.desktop
1070
+        echo "Name[fr]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1071
+        echo "Name[de]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1072
+        echo "Name[es]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1073
+        echo "Name[it]=Blog" >> /home/$MY_USERNAME/Desktop/blog.desktop
1074
+        echo "Name[ru]=Блог" >> /home/$MY_USERNAME/Desktop/blog.desktop
1075
+        echo "Name[zh]=博客" >> /home/$MY_USERNAME/Desktop/blog.desktop
1007
         echo 'Comment=View or create blog entries' >> /home/$MY_USERNAME/Desktop/blog.desktop
1076
         echo 'Comment=View or create blog entries' >> /home/$MY_USERNAME/Desktop/blog.desktop
1008
-        echo 'Exec=mate-terminal -e /usr/local/bin/${PROJECT_NAME}-mesh-blog' >> /home/$MY_USERNAME/Desktop/blog.desktop
1077
+        echo 'Comment[el]=Προβολή ή δημιουργία καταχωρήσεων ιστολογίου' >> /home/$MY_USERNAME/Desktop/blog.desktop
1078
+        echo 'Comment[ar]=عرض إدخالات المدونة أو إنشائها' >> /home/$MY_USERNAME/Desktop/blog.desktop
1079
+        echo 'Comment[ca]=Permet visualitzar o crear entrades de bloc' >> /home/$MY_USERNAME/Desktop/blog.desktop
1080
+        echo 'Comment[hi]=ब्लॉग प्रविष्टियों देखें या बनाएं' >> /home/$MY_USERNAME/Desktop/blog.desktop
1081
+        echo 'Comment[fr]=Afficher ou créer des entrées de blog' >> /home/$MY_USERNAME/Desktop/blog.desktop
1082
+        echo 'Comment[de]=Blog-Einträge anzeigen oder erstellen' >> /home/$MY_USERNAME/Desktop/blog.desktop
1083
+        echo 'Comment[es]=Ver o crear entradas de blog' >> /home/$MY_USERNAME/Desktop/blog.desktop
1084
+        echo 'Comment[it]=Visualizza o crea voci di blog' >> /home/$MY_USERNAME/Desktop/blog.desktop
1085
+        echo 'Comment[ru]=Просмотр или создание записей в блоге' >> /home/$MY_USERNAME/Desktop/blog.desktop
1086
+        echo 'Comment[zh]=查看或创建博客条目' >> /home/$MY_USERNAME/Desktop/blog.desktop
1087
+        echo 'Exec=mate-terminal --full-screen -e /usr/local/bin/${PROJECT_NAME}-mesh-blog' >> /home/$MY_USERNAME/Desktop/blog.desktop
1009
         echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_blog.png' >> /home/$MY_USERNAME/Desktop/blog.desktop
1088
         echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_blog.png' >> /home/$MY_USERNAME/Desktop/blog.desktop
1010
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/blog.desktop
1089
         echo 'StartupNotify=false' >> /home/$MY_USERNAME/Desktop/blog.desktop
1011
         chmod +x /home/$MY_USERNAME/Desktop/blog.desktop
1090
         chmod +x /home/$MY_USERNAME/Desktop/blog.desktop
1025
     if [ ! -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then
1104
     if [ ! -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then
1026
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/tox.desktop
1105
         echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/tox.desktop
1027
         echo 'Name=Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop
1106
         echo 'Name=Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop
1107
+        echo 'Name[el]=Κουβέντα' >> /home/$MY_USERNAME/Desktop/tox.desktop
1108
+        echo 'Name[ar]=دردشة' >> /home/$MY_USERNAME/Desktop/tox.desktop
1109
+        echo 'Name[ca]=Xat' >> /home/$MY_USERNAME/Desktop/tox.desktop
1110
+        echo 'Name[hi]=बातचीत' >> /home/$MY_USERNAME/Desktop/tox.desktop
1111
+        echo 'Name[fr]=Bavarder' >> /home/$MY_USERNAME/Desktop/tox.desktop
1112
+        echo 'Name[de]=Chat' >> /home/$MY_USERNAME/Desktop/tox.desktop
1113
+        echo 'Name[es]=Charla' >> /home/$MY_USERNAME/Desktop/tox.desktop
1114
+        echo 'Name[it]=Chiacchierare' >> /home/$MY_USERNAME/Desktop/tox.desktop
1115
+        echo 'Name[ru]=чат' >> /home/$MY_USERNAME/Desktop/tox.desktop
1116
+        echo 'Name[zh]=聊' >> /home/$MY_USERNAME/Desktop/tox.desktop
1028
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/tox.desktop
1117
         echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/tox.desktop
1029
         echo 'Comment=Chat, Voice and Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
1118
         echo 'Comment=Chat, Voice and Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
1119
+        echo 'Comment[el]=Συνομιλία, Φωνή και βίντεο' >> /home/$MY_USERNAME/Desktop/tox.desktop
1120
+        echo 'Comment[ar]=دردشة، صوت والفيديو' >> /home/$MY_USERNAME/Desktop/tox.desktop
1121
+        echo 'Comment[ca]=Xat, veu i vídeo' >> /home/$MY_USERNAME/Desktop/tox.desktop
1122
+        echo 'Comment[hi]=चैट, वॉयस और वीडियो' >> /home/$MY_USERNAME/Desktop/tox.desktop
1123
+        echo 'Comment[fr]=Chat, voix et vidéo' >> /home/$MY_USERNAME/Desktop/tox.desktop
1124
+        echo 'Comment[de]=Chat, Sprache und Video' >> /home/$MY_USERNAME/Desktop/tox.desktop
1125
+        echo 'Comment[es]=Chat, voz y video' >> /home/$MY_USERNAME/Desktop/tox.desktop
1126
+        echo 'Comment[it]=Chat, voce e video' >> /home/$MY_USERNAME/Desktop/tox.desktop
1127
+        echo 'Comment[ru]=Чат, голос и видео' >> /home/$MY_USERNAME/Desktop/tox.desktop
1128
+        echo 'Comment[zh]=聊天,语音和视频' >> /home/$MY_USERNAME/Desktop/tox.desktop
1030
         echo 'Exec=bash /home/$MY_USERNAME/runtox' >> /home/$MY_USERNAME/Desktop/tox.desktop
1129
         echo 'Exec=bash /home/$MY_USERNAME/runtox' >> /home/$MY_USERNAME/Desktop/tox.desktop
1031
         echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_chat.png" >> /home/$MY_USERNAME/Desktop/tox.desktop
1130
         echo "Icon=/usr/share/$PROJECT_NAME/avatars/icon_chat.png" >> /home/$MY_USERNAME/Desktop/tox.desktop
1032
         echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/tox.desktop
1131
         echo 'StartupNotify=true' >> /home/$MY_USERNAME/Desktop/tox.desktop
1041
             echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/invite.desktop
1140
             echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/invite.desktop
1042
             echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/invite.desktop
1141
             echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/invite.desktop
1043
             echo 'Name=Create Invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
1142
             echo 'Name=Create Invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
1143
+            echo 'Name[el]=Δημιουργία πρόσκλησης' >> /home/$MY_USERNAME/Desktop/invite.desktop
1144
+            echo 'Name[ar]=إنشاء دعوة' >> /home/$MY_USERNAME/Desktop/invite.desktop
1145
+            echo 'Name[ca]=Crea una invitació' >> /home/$MY_USERNAME/Desktop/invite.desktop
1146
+            echo 'Name[hi]=आमंत्रण बनाएं' >> /home/$MY_USERNAME/Desktop/invite.desktop
1147
+            echo 'Name[fr]=Créer une invitation' >> /home/$MY_USERNAME/Desktop/invite.desktop
1148
+            echo 'Name[de]=Einladung erstellen' >> /home/$MY_USERNAME/Desktop/invite.desktop
1149
+            echo 'Name[es]=Crear invitación' >> /home/$MY_USERNAME/Desktop/invite.desktop
1150
+            echo 'Name[it]=Crea Invita' >> /home/$MY_USERNAME/Desktop/invite.desktop
1151
+            echo 'Name[ru]=Создать приглашение' >> /home/$MY_USERNAME/Desktop/invite.desktop
1152
+            echo 'Name[zh]=创建邀请' >> /home/$MY_USERNAME/Desktop/invite.desktop
1044
             echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/invite.desktop
1153
             echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/invite.desktop
1045
-            echo 'Comment=Create an invite for Patchwork or Ferment' >> /home/$MY_USERNAME/Desktop/invite.desktop
1154
+            echo 'Comment=Create an invite for Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1155
+            echo 'Comment[el]=Δημιουργήστε μια πρόσκληση για το Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1156
+            echo 'Comment[ar]=إنشاء دعوة ل باتشورك' >> /home/$MY_USERNAME/Desktop/invite.desktop
1157
+            echo 'Comment[ca]=Crea una invitació per Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1158
+            echo 'Comment[hi]=पैचवर्क के लिए एक आमंत्रण बनाएं' >> /home/$MY_USERNAME/Desktop/invite.desktop
1159
+            echo 'Comment[fr]=Créer une invitation pour Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1160
+            echo 'Comment[de]=Erstellen Sie eine Einladung für Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1161
+            echo 'Comment[es]=Crear una invitación para Patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1162
+            echo 'Comment[it]=Crea un invito per patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1163
+            echo 'Comment[ru]=Создать приглашение на лоскутное одеяло' >> /home/$MY_USERNAME/Desktop/invite.desktop
1164
+            echo 'Comment[zh]=为拼拼创建邀请' >> /home/$MY_USERNAME/Desktop/invite.desktop
1046
             echo 'Exec=mate-terminal -e freedombone-mesh-invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
1165
             echo 'Exec=mate-terminal -e freedombone-mesh-invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
1047
             echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
1166
             echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
1048
             echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop
1167
             echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop
1070
         if [ -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then
1189
         if [ -f /home/$MY_USERNAME/Desktop/tox.desktop ]; then
1071
             rm /home/$MY_USERNAME/Desktop/tox.desktop
1190
             rm /home/$MY_USERNAME/Desktop/tox.desktop
1072
         fi
1191
         fi
1073
-        if [ -f /home/$MY_USERNAME/Desktop/social.desktop ]; then
1074
-            if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/social.desktop; then
1075
-                sed -i 's|Name=.*|Name=Social (Offline)|g' /home/$MY_USERNAME/Desktop/social.desktop
1076
-            fi
1077
-        fi
1078
-        #if [ -f /home/$MY_USERNAME/Desktop/audio.desktop ]; then
1079
-        #    if ! grep -q "Offline" /home/$MY_USERNAME/Desktop/audio.desktop; then
1080
-        #        sed -i 's|Name=.*|Name=Audio/Music (Offline)|g' /home/$MY_USERNAME/Desktop/audio.desktop
1081
-        #    fi
1082
-        #fi
1083
         pkill qtox
1192
         pkill qtox
1084
     fi
1193
     fi
1085
 
1194
 

+ 124
- 8
src/freedombone-image-mesh View File

279
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/help.desktop
279
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/help.desktop
280
     echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/help.desktop
280
     echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/help.desktop
281
     echo 'Name=Help' >> /home/$MY_USERNAME/Desktop/help.desktop
281
     echo 'Name=Help' >> /home/$MY_USERNAME/Desktop/help.desktop
282
+    echo "Name[el]=Βοήθεια" >> /home/$MY_USERNAME/Desktop/help.desktop
283
+    echo "Name[ar]=مساعدة" >> /home/$MY_USERNAME/Desktop/help.desktop
284
+    echo "Name[ca]=Ajuda" >> /home/$MY_USERNAME/Desktop/help.desktop
285
+    echo "Name[hi]=मदद" >> /home/$MY_USERNAME/Desktop/help.desktop
286
+    echo "Name[fr]=Aidez-moi" >> /home/$MY_USERNAME/Desktop/help.desktop
287
+    echo "Name[de]=Hilfe" >> /home/$MY_USERNAME/Desktop/help.desktop
288
+    echo "Name[es]=Ayuda" >> /home/$MY_USERNAME/Desktop/help.desktop
289
+    echo "Name[it]=Aiuto" >> /home/$MY_USERNAME/Desktop/help.desktop
290
+    echo "Name[ru]=Помогите" >> /home/$MY_USERNAME/Desktop/help.desktop
291
+    echo "Name[zh]=帮帮我" >> /home/$MY_USERNAME/Desktop/help.desktop
282
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/help.desktop
292
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/help.desktop
283
     echo 'Comment=Show help' >> /home/$MY_USERNAME/Desktop/help.desktop
293
     echo 'Comment=Show help' >> /home/$MY_USERNAME/Desktop/help.desktop
294
+    echo "Comment[el]=Εμφάνιση βοήθειας" >> /home/$MY_USERNAME/Desktop/help.desktop
295
+    echo "Comment[ar]=عرض المساعدة" >> /home/$MY_USERNAME/Desktop/help.desktop
296
+    echo "Comment[ca]=Mostra ajuda" >> /home/$MY_USERNAME/Desktop/help.desktop
297
+    echo "Comment[hi]=मदद दिखायें" >> /home/$MY_USERNAME/Desktop/help.desktop
298
+    echo "Comment[fr]=Afficher l'aide" >> /home/$MY_USERNAME/Desktop/help.desktop
299
+    echo "Comment[de]=Zeig Hilfe" >> /home/$MY_USERNAME/Desktop/help.desktop
300
+    echo "Comment[es]=Mostrar ayuda" >> /home/$MY_USERNAME/Desktop/help.desktop
301
+    echo "Comment[it]=Mostra aiuto" >> /home/$MY_USERNAME/Desktop/help.desktop
302
+    echo "Comment[ru]=Показать справку" >> /home/$MY_USERNAME/Desktop/help.desktop
303
+    echo "Comment[zh]=显示帮助" >> /home/$MY_USERNAME/Desktop/help.desktop
284
     echo "Exec=bash -c /home/$MY_USERNAME/.showhelp" >> /home/$MY_USERNAME/Desktop/help.desktop
304
     echo "Exec=bash -c /home/$MY_USERNAME/.showhelp" >> /home/$MY_USERNAME/Desktop/help.desktop
285
     echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_help.png" >> /home/$MY_USERNAME/Desktop/help.desktop
305
     echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_help.png" >> /home/$MY_USERNAME/Desktop/help.desktop
286
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/help.desktop
306
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/help.desktop
289
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/wifi.desktop
309
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/wifi.desktop
290
     echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/wifi.desktop
310
     echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/wifi.desktop
291
     echo 'Name=Wifi' >> /home/$MY_USERNAME/Desktop/wifi.desktop
311
     echo 'Name=Wifi' >> /home/$MY_USERNAME/Desktop/wifi.desktop
312
+    echo "Name[el]=Wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop
313
+    echo "Name[ar]=واي فاي" >> /home/$MY_USERNAME/Desktop/wifi.desktop
314
+    echo "Name[ca]=Wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop
315
+    echo "Name[hi]=वाई - फाई" >> /home/$MY_USERNAME/Desktop/wifi.desktop
316
+    echo "Name[fr]=Wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop
317
+    echo "Name[de]=W-lan" >> /home/$MY_USERNAME/Desktop/wifi.desktop
318
+    echo "Name[es]=Wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop
319
+    echo "Name[it]=Wi-Fi" >> /home/$MY_USERNAME/Desktop/wifi.desktop
320
+    echo "Name[ru]=вай-фай" >> /home/$MY_USERNAME/Desktop/wifi.desktop
321
+    echo "Name[zh]=无线上网" >> /home/$MY_USERNAME/Desktop/wifi.desktop
292
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/wifi.desktop
322
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/wifi.desktop
293
     echo 'Comment=Check wifi status' >> /home/$MY_USERNAME/Desktop/wifi.desktop
323
     echo 'Comment=Check wifi status' >> /home/$MY_USERNAME/Desktop/wifi.desktop
294
-    echo 'Exec=mate-terminal -e "sudo batman monitor"' >> /home/$MY_USERNAME/Desktop/wifi.desktop
324
+    echo "Comment[el]=Ελέγξτε την κατάσταση wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop
325
+    echo "Comment[ar]=التحقق من حالة واي فاي" >> /home/$MY_USERNAME/Desktop/wifi.desktop
326
+    echo "Comment[ca]=Comprova l'estat de wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop
327
+    echo "Comment[hi]=वाईफ़ाई स्थिति की जांच करें" >> /home/$MY_USERNAME/Desktop/wifi.desktop
328
+    echo "Comment[fr]=Vérifier l'état du wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop
329
+    echo "Comment[de]=WLAN-Status überprüfen" >> /home/$MY_USERNAME/Desktop/wifi.desktop
330
+    echo "Comment[es]=Verificar el estado del wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop
331
+    echo "Comment[it]=Controllare lo stato wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop
332
+    echo "Comment[ru]=Проверить статус wifi" >> /home/$MY_USERNAME/Desktop/wifi.desktop
333
+    echo "Comment[zh]=检查wifi状态" >> /home/$MY_USERNAME/Desktop/wifi.desktop
334
+    echo 'Exec=mate-terminal --full-screen -e "sudo batman monitor"' >> /home/$MY_USERNAME/Desktop/wifi.desktop
295
     echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_wifi.png" >> /home/$MY_USERNAME/Desktop/wifi.desktop
335
     echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_wifi.png" >> /home/$MY_USERNAME/Desktop/wifi.desktop
296
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/wifi.desktop
336
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/wifi.desktop
297
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/wifi.desktop
337
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/wifi.desktop
299
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/restart.desktop
339
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/restart.desktop
300
     echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/restart.desktop
340
     echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/restart.desktop
301
     echo 'Name=Network Restart' >> /home/$MY_USERNAME/Desktop/restart.desktop
341
     echo 'Name=Network Restart' >> /home/$MY_USERNAME/Desktop/restart.desktop
342
+    echo "Name[el]=Δικτυακή επανεκκίνηση" >> /home/$MY_USERNAME/Desktop/restart.desktop
343
+    echo "Name[ar]=إعادة تشغيل الشبكة" >> /home/$MY_USERNAME/Desktop/restart.desktop
344
+    echo "Name[ca]=Reinicia la xarxa" >> /home/$MY_USERNAME/Desktop/restart.desktop
345
+    echo "Name[hi]=नेटवर्क पुनरारंभ करें" >> /home/$MY_USERNAME/Desktop/restart.desktop
346
+    echo "Name[fr]=Redémarrage du réseau" >> /home/$MY_USERNAME/Desktop/restart.desktop
347
+    echo "Name[de]=Netzwerk Neustart" >> /home/$MY_USERNAME/Desktop/restart.desktop
348
+    echo "Name[es]=Reinicio de red" >> /home/$MY_USERNAME/Desktop/restart.desktop
349
+    echo "Name[it]=Riavvia rete" >> /home/$MY_USERNAME/Desktop/restart.desktop
350
+    echo "Name[ru]=Перезапуск сети" >> /home/$MY_USERNAME/Desktop/restart.desktop
351
+    echo "Name[zh]=网络重新启动" >> /home/$MY_USERNAME/Desktop/restart.desktop
302
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/restart.desktop
352
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/restart.desktop
303
-    echo 'Comment=Restart batman' >> /home/$MY_USERNAME/Desktop/restart.desktop
353
+    echo 'Comment=Restart the mesh network daemon' >> /home/$MY_USERNAME/Desktop/restart.desktop
354
+    echo "Comment[el]=Κάντε επανεκκίνηση του δαίμονα του δικτύου ματιών" >> /home/$MY_USERNAME/Desktop/restart.desktop
355
+    echo "Comment[ar]=إعادة تشغيل شبكة شبكة الخفي" >> /home/$MY_USERNAME/Desktop/restart.desktop
356
+    echo "Comment[ca]=Reinicia el dimoni de la xarxa de malla" >> /home/$MY_USERNAME/Desktop/restart.desktop
357
+    echo "Comment[hi]=जाल नेटवर्क डेमॉन को पुनरारंभ करें" >> /home/$MY_USERNAME/Desktop/restart.desktop
358
+    echo "Comment[fr]=Redémarrez le démon réseau maillé" >> /home/$MY_USERNAME/Desktop/restart.desktop
359
+    echo "Comment[de]=Starten Sie den Mesh-Netzwerk-Daemon neu." >> /home/$MY_USERNAME/Desktop/restart.desktop
360
+    echo "Comment[es]=Reinicie el daemon de red de malla" >> /home/$MY_USERNAME/Desktop/restart.desktop
361
+    echo "Comment[it]=Riavviare il daemon della rete mesh" >> /home/$MY_USERNAME/Desktop/restart.desktop
362
+    echo "Comment[ru]=Перезапустить демон сетчатой сети" >> /home/$MY_USERNAME/Desktop/restart.desktop
363
+    echo "Comment[zh]=重新启动网状网络守护程序" >> /home/$MY_USERNAME/Desktop/restart.desktop
304
     echo 'Exec=mate-terminal -e "sudo batman restart 2> /dev/null"' >> /home/$MY_USERNAME/Desktop/restart.desktop
364
     echo 'Exec=mate-terminal -e "sudo batman restart 2> /dev/null"' >> /home/$MY_USERNAME/Desktop/restart.desktop
305
     echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_restart_network.png" >> /home/$MY_USERNAME/Desktop/restart.desktop
365
     echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_restart_network.png" >> /home/$MY_USERNAME/Desktop/restart.desktop
306
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/restart.desktop
366
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/restart.desktop
309
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/new_identity.desktop
369
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/new_identity.desktop
310
     echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
370
     echo 'Version=1.0' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
311
     echo 'Name=New Identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
371
     echo 'Name=New Identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
372
+    echo "Name[el]=Νέα ταυτότητα" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
373
+    echo "Name[ar]=هوية جديدة" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
374
+    echo "Name[ca]=Nova identitat" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
375
+    echo "Name[hi]=नई पहचान" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
376
+    echo "Name[fr]=Nouvelle identité" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
377
+    echo "Name[de]=Neue Identität" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
378
+    echo "Name[es]=Nueva identidad" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
379
+    echo "Name[it]=Nuova Identità" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
380
+    echo "Name[ru]=Новая идентификация" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
381
+    echo "Name[zh]=新身份" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
312
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
382
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
313
     echo 'Comment=Create a new identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
383
     echo 'Comment=Create a new identity' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
314
-    echo "Exec=mate-terminal -e ${PROJECT_NAME}-mesh-reset" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
384
+    echo "Comment[el]=Δημιουργήστε μια νέα ταυτότητα" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
385
+    echo "Comment[ar]=إنشاء هوية جديدة" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
386
+    echo "Comment[ca]=Crea una nova identitat" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
387
+    echo "Comment[hi]=एक नई पहचान बनाएँ" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
388
+    echo "Comment[fr]=Créer une nouvelle identité" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
389
+    echo "Comment[de]=Erstellen Sie eine neue Identität" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
390
+    echo "Comment[es]=Crea una nueva identidad" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
391
+    echo "Comment[it]=Crea una nuova identità" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
392
+    echo "Comment[ru]=Создайте новое удостоверение личности" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
393
+    echo "Comment[zh]=创建一个新的身份" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
394
+    echo "Exec=mate-terminal --full-screen -e ${PROJECT_NAME}-mesh-reset" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
315
     echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_new_identity.png" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
395
     echo "Icon=/usr/share/${PROJECT_NAME}/avatars/icon_new_identity.png" >> /home/$MY_USERNAME/Desktop/new_identity.desktop
316
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
396
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
317
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
397
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/new_identity.desktop
318
 
398
 
319
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
399
     echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/social.desktop
320
-    echo 'Name=Social (Offline)' >> /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
321
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
411
     echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/social.desktop
322
-    echo 'Comment=A decentralized messaging and sharing app built on top of Secure Scuttlebutt (SSB)' >> /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
+    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
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
+    echo "Comment[de]=Eine dezentralisierte Messaging- und Sharing-App, die auf Secure Scuttlebutt basiert" >> /home/$MY_USERNAME/Desktop/social.desktop
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 decentralizzata di messaggistica e condivisione costruita sulla base di Secure Shuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
421
+    echo "Comment[ru]=Децентрализованное приложение для обмена сообщениями и совместного использования, построенное на основе Secure Scuttlebutt" >> /home/$MY_USERNAME/Desktop/social.desktop
422
+    echo "Comment[zh]=安全Scuttlebutt之上构建的分散式消息和共享应用程序" >> /home/$MY_USERNAME/Desktop/social.desktop
323
     echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
423
     echo 'Exec=bash /usr/bin/start_patchwork' >> /home/$MY_USERNAME/Desktop/social.desktop
324
-    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
325
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop
425
     echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/social.desktop
326
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop
426
     echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/social.desktop
327
 
427
 
328
     #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
428
     #echo '[Desktop Entry]' > /home/$MY_USERNAME/Desktop/audio.desktop
329
-    #echo 'Name=Audio/Music (Offline)' >> /home/$MY_USERNAME/Desktop/audio.desktop
429
+    #echo 'Name=Audio/Music' >> /home/$MY_USERNAME/Desktop/audio.desktop
330
     #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
430
     #echo 'Type=Application' >> /home/$MY_USERNAME/Desktop/audio.desktop
331
     #echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
431
     #echo 'Comment=Audio publishing and streaming' >> /home/$MY_USERNAME/Desktop/audio.desktop
332
     #echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
432
     #echo 'Exec=bash /usr/bin/start_ferment' >> /home/$MY_USERNAME/Desktop/audio.desktop
885
         rm -rf /home/$MY_USERNAME/.ssb
985
         rm -rf /home/$MY_USERNAME/.ssb
886
     fi
986
     fi
887
 
987
 
888
-    # Remove vpn keys
988
+    # Remove vpn host keys
889
     if [ -d /etc/openvpn/easy-rsa/keys ]; then
989
     if [ -d /etc/openvpn/easy-rsa/keys ]; then
890
         rm -rf /etc/openvpn/easy-rsa/keys/*
990
         rm -rf /etc/openvpn/easy-rsa/keys/*
891
     fi
991
     fi
892
 
992
 
993
+    # Remove any existing vpn client keys
994
+    if [ -f /home/$MY_USERNAME/vpn.tar.gz ]; then
995
+        rm /home/$MY_USERNAME/vpn.tar.gz
996
+    fi
997
+    if [ -f /home/$USERNAME/stunnel.pem ]; then
998
+        rm /home/$USERNAME/stunnel.pem
999
+    fi
1000
+    if [ -f /home/$USERNAME/stunnel.p12 ]; then
1001
+        rm /home/$USERNAME/stunnel.p12
1002
+    fi
1003
+
1004
+    # Remove cryptpad datastore
1005
+    if [ -d $CRYPTPAD_DIR/datastore ]; then
1006
+        rm -rf $CRYPTPAD_DIR/datastore
1007
+    fi
1008
+
893
     echo $'Beginning mesh node setup' >> $INSTALL_LOG
1009
     echo $'Beginning mesh node setup' >> $INSTALL_LOG
894
 
1010
 
895
     if [ -d /home/$MY_USERNAME/.config ]; then
1011
     if [ -d /home/$MY_USERNAME/.config ]; then

+ 30
- 0
src/freedombone-mesh-batman View File

425
         exit 723657
425
         exit 723657
426
     fi
426
     fi
427
 
427
 
428
+    clear
429
+    echo ''
430
+    echo $'*** Stopping network ***'
431
+    echo ''
432
+
428
     stop
433
     stop
429
 
434
 
430
     echo "info: monitoring mesh network $WIFI_SSID on $IFACE"
435
     echo "info: monitoring mesh network $WIFI_SSID on $IFACE"
432
     systemctl stop network-manager
437
     systemctl stop network-manager
433
     sleep 5
438
     sleep 5
434
 
439
 
440
+    clear
441
+    echo ''
442
+    echo $'*** Setting firewall rate limit ***'
443
+    echo ''
444
+
435
     global_rate_limit
445
     global_rate_limit
436
 
446
 
447
+    clear
448
+    echo ''
449
+    echo $'*** Enabling wifi adaptor in monitor mode ***'
450
+    echo ''
451
+
437
     # Might have to re-enable wifi
452
     # Might have to re-enable wifi
438
     rfkill unblock $(rfkill list|awk -F: "/phy/ {print $1}") || true
453
     rfkill unblock $(rfkill list|awk -F: "/phy/ {print $1}") || true
439
 
454
 
448
     modprobe batman-adv
463
     modprobe batman-adv
449
     batctl if add $IFACE
464
     batctl if add $IFACE
450
     ifconfig $IFACE up
465
     ifconfig $IFACE up
466
+
451
     horst -i $IFACE
467
     horst -i $IFACE
468
+
469
+    clear
470
+    echo ''
471
+    echo $'*** Restarting the network daemon. This may take a while. ***'
472
+    echo ''
473
+
452
     start
474
     start
453
 }
475
 }
454
 
476
 
463
         $1
485
         $1
464
         ;;
486
         ;;
465
     restart)
487
     restart)
488
+        clear
489
+        echo ''
490
+        echo $'*** Stopping mesh network connection ***'
491
+        echo ''
466
         stop
492
         stop
467
         sleep 10
493
         sleep 10
494
+        clear
495
+        echo ''
496
+        echo $'*** Starting mesh network connection ***'
497
+        echo ''
468
         start
498
         start
469
         ;;
499
         ;;
470
     ping)
500
     ping)

+ 16
- 23
src/freedombone-mesh-reset View File

33
 
33
 
34
 MESH_INSTALL_COMPLETED=/root/.mesh_setup_completed
34
 MESH_INSTALL_COMPLETED=/root/.mesh_setup_completed
35
 
35
 
36
-dialog --title $"New Identity" \
37
-       --backtitle $"Freedombone Mesh" \
38
-       --defaultno \
39
-       --yesno $"\nDo you want to reset your identity? This will reset ALL data for this peer, and you will not be able to recover it." 8 60
40
-sel=$?
41
-case $sel in
42
-    0) sudo batman stop
43
-       sudo pkill qtox
44
-       sudo pkill firefox
45
-       sudo pkill iceweasel
46
-       sudo pkill midori
47
-       sudo pkill patchwork
48
-       sudo rm -f $MESH_INSTALL_COMPLETED
49
-       sudo ${PROJECT_NAME}-image-mesh $USER new
50
-       sudo batman start
51
-       if [ -f $HOME/mesh-desktop.sh ]; then
52
-           $HOME/mesh-desktop.sh
53
-       else
54
-           dialog --title $"New Identity" \
55
-                  --msgbox $"You now have a new identity" 6 40
56
-       fi
57
-       ;;
58
-esac
36
+if ! zenity --question --title='New Identity' --text="Do you want to reset your identity? This will reset ALL data for this peer, and you will not be able to recover it." --ok-label=No --cancel-label=Yes --width=300; then
37
+    sudo batman stop
38
+    sudo pkill qtox
39
+    sudo pkill firefox
40
+    sudo pkill iceweasel
41
+    sudo pkill midori
42
+    sudo pkill patchwork
43
+    sudo rm -f $MESH_INSTALL_COMPLETED
44
+    sudo ${PROJECT_NAME}-image-mesh $USER new
45
+    sudo batman start
46
+    if [ -f $HOME/mesh-desktop.sh ]; then
47
+        $HOME/mesh-desktop.sh
48
+    else
49
+        zenity --info --title=$"New Identity" --text=$"You now have a new identity" --width=200
50
+    fi
51
+fi
59
 
52
 
60
 exit 0
53
 exit 0

+ 22
- 22
website/EN/mesh_images.html View File

3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
3
 "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
4
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
5
 <head>
5
 <head>
6
-<!-- 2017-10-27 Fri 11:40 -->
6
+<!-- 2017-10-30 Mon 12:14 -->
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
7
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
8
 <meta name="viewport" content="width=device-width, initial-scale=1" />
9
 <title>&lrm;</title>
9
 <title>&lrm;</title>
246
 
246
 
247
 <center><h1>Mesh Network: Images</h1></center>
247
 <center><h1>Mesh Network: Images</h1></center>
248
 
248
 
249
-<div id="outline-container-orgc7e2a0b" class="outline-2">
250
-<h2 id="orgc7e2a0b">Pre-built Disk Images</h2>
251
-<div class="outline-text-2" id="text-orgc7e2a0b">
249
+<div id="outline-container-orgbb633ca" class="outline-2">
250
+<h2 id="orgbb633ca">Pre-built Disk Images</h2>
251
+<div class="outline-text-2" id="text-orgbb633ca">
252
 </div>
252
 </div>
253
-<div id="outline-container-orgea5a9c8" class="outline-3">
254
-<h3 id="orgea5a9c8">Writing many images quickly</h3>
255
-<div class="outline-text-3" id="text-orgea5a9c8">
253
+<div id="outline-container-org2ed661a" class="outline-3">
254
+<h3 id="org2ed661a">Writing many images quickly</h3>
255
+<div class="outline-text-3" id="text-org2ed661a">
256
 <p>
256
 <p>
257
 There may be situations where you need to write the same disk image to multiple drives at the same time in order to maximize rate of deployment. In the instructions given below the <b>dd</b> command is used for writing to the target drive, but to write to multiple drives you can use a tool such as <a href="https://wiki.gnome.org/Apps/MultiWriter">GNOME MultiWriter</a>.
257
 There may be situations where you need to write the same disk image to multiple drives at the same time in order to maximize rate of deployment. In the instructions given below the <b>dd</b> command is used for writing to the target drive, but to write to multiple drives you can use a tool such as <a href="https://wiki.gnome.org/Apps/MultiWriter">GNOME MultiWriter</a>.
258
 </p>
258
 </p>
280
 </p>
280
 </p>
281
 </div>
281
 </div>
282
 </div>
282
 </div>
283
-<div id="outline-container-org67e59e6" class="outline-3">
284
-<h3 id="org67e59e6">Client images</h3>
285
-<div class="outline-text-3" id="text-org67e59e6">
283
+<div id="outline-container-orgac03b6d" class="outline-3">
284
+<h3 id="orgac03b6d">Client images</h3>
285
+<div class="outline-text-3" id="text-orgac03b6d">
286
 <div class="org-center">
286
 <div class="org-center">
287
 
287
 
288
 <div class="figure">
288
 <div class="figure">
301
 wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig
301
 wget https://freedombone.net/downloads/current/freedombone-meshclient-i386.img.xz.sig
302
 gpg --verify freedombone-meshclient-i386.img.xz.sig
302
 gpg --verify freedombone-meshclient-i386.img.xz.sig
303
 sha256sum freedombone-meshclient-i386.img.xz
303
 sha256sum freedombone-meshclient-i386.img.xz
304
-61e474afae14774d7aa479b6727fd5e77bdc1854e547b3c5b630bf10542a9581
304
+6dcf7418d6bd7dbe79f5fcf96f83b48eb59f6c11a50b67c5e2c013195751989e
305
 unxz freedombone-meshclient-i386.img.xz
305
 unxz freedombone-meshclient-i386.img.xz
306
 sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
306
 sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
307
 sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
307
 sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
322
 wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig
322
 wget https://freedombone.net/downloads/current/freedombone-meshclient-insecure-i386.img.xz.sig
323
 gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig
323
 gpg --verify freedombone-meshclient-insecure-i386.img.xz.sig
324
 sha256sum freedombone-meshclient-insecure-i386.img.xz
324
 sha256sum freedombone-meshclient-insecure-i386.img.xz
325
-fec843303d7d280859f75f7a8edccd70512915a34d4cc0787b5de7d8fbde5c81
325
+4e9ee5fc5aa11fa58bcceae7f04f017c005a4a2595c0d64ac49de39f88b6590d
326
 unxz freedombone-meshclient-insecure-i386.img.xz
326
 unxz freedombone-meshclient-insecure-i386.img.xz
327
 sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
327
 sudo dd <span class="org-variable-name">if</span>=/dev/zero <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">count</span>=8
328
 sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-insecure-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
328
 sudo dd <span class="org-variable-name">bs</span>=1M <span class="org-variable-name">if</span>=freedombone-meshclient-insecure-i386.img <span class="org-variable-name">of</span>=/dev/sdX <span class="org-variable-name">conv</span>=fdatasync
331
 </div>
331
 </div>
332
 </div>
332
 </div>
333
 
333
 
334
-<div id="outline-container-orgbc42549" class="outline-3">
335
-<h3 id="orgbc42549">Router images</h3>
336
-<div class="outline-text-3" id="text-orgbc42549">
334
+<div id="outline-container-orgab65b99" class="outline-3">
335
+<h3 id="orgab65b99">Router images</h3>
336
+<div class="outline-text-3" id="text-orgab65b99">
337
 <p>
337
 <p>
338
 Routers are intended to build network coverage for an area using small and low cost hardware. You can bolt them to walls or leave them on window ledges. They don't have any user interface and their only job is to haul network traffic across the mesh and to enable peers to find each other via running bootstrap nodes for Tox and IPFS. Copy the image to a microSD card and insert it into the router, plug in an Atheros wifi dongle and power on. That should be all you need to do.
338
 Routers are intended to build network coverage for an area using small and low cost hardware. You can bolt them to walls or leave them on window ledges. They don't have any user interface and their only job is to haul network traffic across the mesh and to enable peers to find each other via running bootstrap nodes for Tox and IPFS. Copy the image to a microSD card and insert it into the router, plug in an Atheros wifi dongle and power on. That should be all you need to do.
339
 </p>
339
 </p>
340
 </div>
340
 </div>
341
-<div id="outline-container-org3b057bd" class="outline-4">
342
-<h4 id="org3b057bd">Beaglebone Black</h4>
343
-<div class="outline-text-4" id="text-org3b057bd">
341
+<div id="outline-container-orgf1035dc" class="outline-4">
342
+<h4 id="orgf1035dc">Beaglebone Black</h4>
343
+<div class="outline-text-4" id="text-orgf1035dc">
344
 <div class="org-center">
344
 <div class="org-center">
345
 
345
 
346
 <div class="figure">
346
 <div class="figure">
377
 </div>
377
 </div>
378
 </div>
378
 </div>
379
 
379
 
380
-<div id="outline-container-orgeb576f8" class="outline-2">
381
-<h2 id="orgeb576f8">Building Disk Images</h2>
382
-<div class="outline-text-2" id="text-orgeb576f8">
380
+<div id="outline-container-org9976d21" class="outline-2">
381
+<h2 id="org9976d21">Building Disk Images</h2>
382
+<div class="outline-text-2" id="text-org9976d21">
383
 <p>
383
 <p>
384
 It's better not to trust images downloaded from random places on the interwebs. Chances are that unless you are in the web of trust of the above GPG signatures then they don't mean very much to you. If you actually want something trustworthy then build the images from scratch. It will take some time. Here's how to do it.
384
 It's better not to trust images downloaded from random places on the interwebs. Chances are that unless you are in the web of trust of the above GPG signatures then they don't mean very much to you. If you actually want something trustworthy then build the images from scratch. It will take some time. Here's how to do it.
385
 </p>
385
 </p>
394
 wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig
394
 wget https://freedombone.net/downloads/current/freedombone.tar.gz.sig
395
 gpg --verify freedombone.tar.gz.sig
395
 gpg --verify freedombone.tar.gz.sig
396
 sha256sum freedombone.tar.gz
396
 sha256sum freedombone.tar.gz
397
-e2715e27b142a21fa257eab15778ddc96f86fda70f8d91d47c4c9aa19f22e272
397
+024aedd3a264e963d791daaada347aba1295bc5caebba34ad9b19dc117a8cac9
398
 tar -xzvf freedombone.tar.gz
398
 tar -xzvf freedombone.tar.gz
399
 <span class="org-builtin">cd</span> freedombone
399
 <span class="org-builtin">cd</span> freedombone
400
 git checkout stretch
400
 git checkout stretch