Bob Mottram 7 vuotta sitten
vanhempi
commit
c6fd0d43c8

+ 4
- 4
src/freedombone-app-postactiv Näytä tiedosto

65
     domain_name=$1
65
     domain_name=$1
66
 
66
 
67
     if [ -f "/var/www/${domain_name}/htdocs/static/logo.png" ]; then
67
     if [ -f "/var/www/${domain_name}/htdocs/static/logo.png" ]; then
68
-        if [ -f ~/freedombone/img/postactiv.png ]; then
69
-            cp ~/freedombone/img/postactiv.png "/var/www/${domain_name}/htdocs/static/logo.png"
68
+        if [ -f "$HOME/${PROJECT_NAME}/img/postactiv.png" ]; then
69
+            cp "$HOME/${PROJECT_NAME}/img/postactiv.png" "/var/www/${domain_name}/htdocs/static/logo.png"
70
         else
70
         else
71
-            if [ -f "/home/$MY_USERNAME/freedombone/img/postactiv.png" ]; then
72
-                cp "/home/$MY_USERNAME/freedombone/img/postactiv.png" "/var/www/${domain_name}/htdocs/static/logo.png"
71
+            if [ -f "/home/$MY_USERNAME/${PROJECT_NAME}/img/postactiv.png" ]; then
72
+                cp "/home/$MY_USERNAME/${PROJECT_NAME}/img/postactiv.png" "/var/www/${domain_name}/htdocs/static/logo.png"
73
             fi
73
             fi
74
         fi
74
         fi
75
     fi
75
     fi

+ 4
- 4
src/freedombone-app-searx Näytä tiedosto

56
 }
56
 }
57
 
57
 
58
 function searx_set_default_background {
58
 function searx_set_default_background {
59
-    if [ -f ~/freedombone/img/backgrounds/searx.jpg ]; then
60
-        cp ~/freedombone/img/backgrounds/searx.jpg /etc/searx/searx/static/themes/courgette/img/bg-body-index.jpg
59
+    if [ -f "$HOME/${PROJECT_NAME}/img/backgrounds/searx.jpg" ]; then
60
+        cp "$HOME/${PROJECT_NAME}/img/backgrounds/searx.jpg" /etc/searx/searx/static/themes/courgette/img/bg-body-index.jpg
61
         chown -R searx:searx ${SEARX_PATH}/searx
61
         chown -R searx:searx ${SEARX_PATH}/searx
62
     else
62
     else
63
-        if [ -f "/home/$MY_USERNAME/freedombone/img/backgrounds/searx.jpg" ]; then
64
-            cp "/home/$MY_USERNAME/freedombone/img/backgrounds/searx.jpg" "/etc/searx/searx/static/themes/courgette/img/bg-body-index.jpg"
63
+        if [ -f "/home/$MY_USERNAME/${PROJECT_NAME}/img/backgrounds/searx.jpg" ]; then
64
+            cp "/home/$MY_USERNAME/${PROJECT_NAME}/img/backgrounds/searx.jpg" "/etc/searx/searx/static/themes/courgette/img/bg-body-index.jpg"
65
             chown -R searx:searx ${SEARX_PATH}/searx
65
             chown -R searx:searx ${SEARX_PATH}/searx
66
         fi
66
         fi
67
     fi
67
     fi

+ 4
- 4
src/freedombone-app-xmpp Näytä tiedosto

377
 
377
 
378
     if [ ! -f "$INSTALL_DIR/$prosody_modules_filename" ]; then
378
     if [ ! -f "$INSTALL_DIR/$prosody_modules_filename" ]; then
379
         # Obtain the modules
379
         # Obtain the modules
380
-        if [ -f ~/freedombone/image_build/$prosody_modules_filename ]; then
381
-            cp ~/freedombone/image_build/$prosody_modules_filename "$INSTALL_DIR"
380
+        if [ -f "$HOME/${PROJECT_NAME}/image_build/$prosody_modules_filename" ]; then
381
+            cp "$HOME/${PROJECT_NAME}/image_build/$prosody_modules_filename" "$INSTALL_DIR"
382
         else
382
         else
383
-            if [ -f "/home/$MY_USERNAME/freedombone/image_build/$prosody_modules_filename" ]; then
384
-                cp "/home/$MY_USERNAME/freedombone/image_build/$prosody_modules_filename" "$INSTALL_DIR"
383
+            if [ -f "/home/$MY_USERNAME/${PROJECT_NAME}/image_build/$prosody_modules_filename" ]; then
384
+                cp "/home/$MY_USERNAME/${PROJECT_NAME}/image_build/$prosody_modules_filename" "$INSTALL_DIR"
385
             fi
385
             fi
386
         fi
386
         fi
387
 
387
 

+ 1
- 1
src/freedombone-config Näytä tiedosto

138
     echo ''
138
     echo ''
139
     echo ''
139
     echo ''
140
     echo $'  -h --help                         Show help'
140
     echo $'  -h --help                         Show help'
141
-    echo $'  -f --filename                     Configuration file (usually freedombone.cfg)'
141
+    echo $"  -f --filename                     Configuration file (usually ${PROJECT_NAME}.cfg)"
142
     echo $'  -m --min                          Minimum password length (characters)'
142
     echo $'  -m --min                          Minimum password length (characters)'
143
     echo $'  -w --www                          Freedombone web site'
143
     echo $'  -w --www                          Freedombone web site'
144
     echo $'  -o --onion [yes|no]               Whether to only create .onion sites'
144
     echo $'  -o --onion [yes|no]               Whether to only create .onion sites'

+ 1
- 1
src/freedombone-image Näytä tiedosto

244
             cd "$USERHOME/develop/multipath-tools" || exit 27462454
244
             cd "$USERHOME/develop/multipath-tools" || exit 27462454
245
             makepkg --force --noconfirm
245
             makepkg --force --noconfirm
246
             makepkg -i --force --noconfirm
246
             makepkg -i --force --noconfirm
247
-            sudo wget "https://raw.githubusercontent.com/bashrc/freedombone/master/image_build/debootstrap/scripts/${DEBIAN_VERSION}" -O /usr/share/debootstrap/scripts/debscript
247
+            sudo wget "https://raw.githubusercontent.com/bashrc/${PROJECT_NAME}/master/image_build/debootstrap/scripts/${DEBIAN_VERSION}" -O /usr/share/debootstrap/scripts/debscript
248
             sudo cp -f "/usr/share/debootstrap/scripts/debscript" "/usr/share/debootstrap/scripts/${DEBIAN_VERSION}"
248
             sudo cp -f "/usr/share/debootstrap/scripts/debscript" "/usr/share/debootstrap/scripts/${DEBIAN_VERSION}"
249
             if [ ! -f "/usr/share/debootstrap/scripts/${DEBIAN_VERSION}" ]; then
249
             if [ ! -f "/usr/share/debootstrap/scripts/${DEBIAN_VERSION}" ]; then
250
                 echo $"No debian debootstrap script was found for $DEBIAN_VERSION"
250
                 echo $"No debian debootstrap script was found for $DEBIAN_VERSION"

+ 3
- 3
src/freedombone-image-customise Näytä tiedosto

437
       echo "                    echo 'User=root' >> /etc/systemd/system/wifistart.service";
437
       echo "                    echo 'User=root' >> /etc/systemd/system/wifistart.service";
438
       echo "                    echo 'Group=root' >> /etc/systemd/system/wifistart.service";
438
       echo "                    echo 'Group=root' >> /etc/systemd/system/wifistart.service";
439
       echo "                    echo 'WorkingDirectory=/root' >> /etc/systemd/system/wifistart.service";
439
       echo "                    echo 'WorkingDirectory=/root' >> /etc/systemd/system/wifistart.service";
440
-      echo "                    echo 'ExecStart=/usr/local/bin/freedombone-wifi --wait 5 2> /dev/null' >> /etc/systemd/system/wifistart.service";
440
+      echo "                    echo 'ExecStart=/usr/local/bin/${PROJECT_NAME}-wifi --wait 5 2> /dev/null' >> /etc/systemd/system/wifistart.service";
441
       echo "                    echo '' >> /etc/systemd/system/wifistart.service";
441
       echo "                    echo '' >> /etc/systemd/system/wifistart.service";
442
       echo "                    echo '[Install]' >> /etc/systemd/system/wifistart.service";
442
       echo "                    echo '[Install]' >> /etc/systemd/system/wifistart.service";
443
       echo "                    echo 'WantedBy=multi-user.target' >> /etc/systemd/system/wifistart.service";
443
       echo "                    echo 'WantedBy=multi-user.target' >> /etc/systemd/system/wifistart.service";
483
 }
483
 }
484
 
484
 
485
 atheros_wifi() {
485
 atheros_wifi() {
486
-    chroot "$rootdir" dpkg -i /root/freedombone/drivers/firmware-ath9k-htc.deb
486
+    chroot "$rootdir" dpkg -i /root/${PROJECT_NAME}/drivers/firmware-ath9k-htc.deb
487
     chroot "$rootdir" apt-get -yq install firmware-linux-free
487
     chroot "$rootdir" apt-get -yq install firmware-linux-free
488
 }
488
 }
489
 
489
 
1526
             echo 'Comment[it]=Crea un invito per patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1526
             echo 'Comment[it]=Crea un invito per patchwork' >> /home/$MY_USERNAME/Desktop/invite.desktop
1527
             echo 'Comment[ru]=    ' >> /home/$MY_USERNAME/Desktop/invite.desktop
1527
             echo 'Comment[ru]=    ' >> /home/$MY_USERNAME/Desktop/invite.desktop
1528
             echo 'Comment[zh]=' >> /home/$MY_USERNAME/Desktop/invite.desktop
1528
             echo 'Comment[zh]=' >> /home/$MY_USERNAME/Desktop/invite.desktop
1529
-            echo 'Exec=mate-terminal -e freedombone-mesh-invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
1529
+            echo 'Exec=mate-terminal -e ${PROJECT_NAME}-mesh-invite' >> /home/$MY_USERNAME/Desktop/invite.desktop
1530
             echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
1530
             echo 'Icon=/usr/share/$PROJECT_NAME/avatars/icon_invite.png' >> /home/$MY_USERNAME/Desktop/invite.desktop
1531
             echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop
1531
             echo 'Terminal=false' >> /home/$MY_USERNAME/Desktop/invite.desktop
1532
             echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/invite.desktop
1532
             echo 'Categories=Application;' >> /home/$MY_USERNAME/Desktop/invite.desktop

+ 1
- 1
src/freedombone-image-vmdebootstrap Näytä tiedosto

30
 export TEXTDOMAINDIR="/usr/share/locale"
30
 export TEXTDOMAINDIR="/usr/share/locale"
31
 
31
 
32
 VMDEBOOTSTRAP_REPO="https://github.com/bashrc/vmdebootstrap"
32
 VMDEBOOTSTRAP_REPO="https://github.com/bashrc/vmdebootstrap"
33
-VMDEBOOTSTRAP_BRANCH='bashrc/freedombone'
33
+VMDEBOOTSTRAP_BRANCH="bashrc/${PROJECT_NAME}"
34
 
34
 
35
 mkdir -p vendor
35
 mkdir -p vendor
36
 if [ -d vendor/vmdebootstrap ] ; then
36
 if [ -d vendor/vmdebootstrap ] ; then

+ 1
- 1
src/freedombone-mesh-blog Näytä tiedosto

88
 }
88
 }
89
 
89
 
90
 function view_blog {
90
 function view_blog {
91
-    freedombone-mesh-visit-site '/Blog'
91
+    ${PROJECT_NAME}-mesh-visit-site '/Blog'
92
     exit 0
92
     exit 0
93
 }
93
 }
94
 
94
 

+ 3
- 3
src/freedombone-prepare-scripts Näytä tiedosto

30
 
30
 
31
 cat /usr/local/bin/${PROJECT_NAME}-vars /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-* /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-* > /tmp/includescripts
31
 cat /usr/local/bin/${PROJECT_NAME}-vars /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-* /usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-* > /tmp/includescripts
32
 
32
 
33
-cat /tmp/includescripts /usr/local/bin/freedombone-controlpanel > /usr/local/bin/control
34
-cat /tmp/includescripts /usr/local/bin/freedombone-controlpanel-user > /usr/local/bin/controluser
35
-cat /tmp/includescripts /usr/local/bin/freedombone-addremove > /usr/local/bin/addremove
33
+cat /tmp/includescripts /usr/local/bin/${PROJECT_NAME}-controlpanel > /usr/local/bin/control
34
+cat /tmp/includescripts /usr/local/bin/${PROJECT_NAME}-controlpanel-user > /usr/local/bin/controluser
35
+cat /tmp/includescripts /usr/local/bin/${PROJECT_NAME}-addremove > /usr/local/bin/addremove
36
 
36
 
37
 sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/control
37
 sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/control
38
 sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/controluser
38
 sed -i '/# Start including files/,/# End including files/d' /usr/local/bin/controluser

+ 1
- 1
src/freedombone-upgrade Näytä tiedosto

64
 if [ -f /usr/bin/backupdatabases ]; then
64
 if [ -f /usr/bin/backupdatabases ]; then
65
     if grep -q "cat /root/dbpass" /usr/bin/backupdatabases; then
65
     if grep -q "cat /root/dbpass" /usr/bin/backupdatabases; then
66
         # update to using the password manager
66
         # update to using the password manager
67
-        sed -i "s|cat /root/dbpass|freedombone-pass -u root -a mariadb|g" /usr/bin/backupdatabases
67
+        sed -i "s|cat /root/dbpass|${PROJECT_NAME}-pass -u root -a mariadb|g" /usr/bin/backupdatabases
68
     fi
68
     fi
69
 fi
69
 fi
70
 
70
 

+ 2
- 2
src/freedombone-utils-dns Näytä tiedosto

119
     fi
119
     fi
120
 
120
 
121
     # add the update command to cron
121
     # add the update command to cron
122
-    if ! grep -q "/usr/local/bin/freedombone-freedns" /etc/crontab; then
122
+    if ! grep -q "/usr/local/bin/${PROJECT_NAME}-freedns" /etc/crontab; then
123
         function_check cron_add_mins
123
         function_check cron_add_mins
124
-        cron_add_mins 3 '/usr/local/bin/freedombone-freedns'
124
+        cron_add_mins 3 "/usr/local/bin/${PROJECT_NAME}-freedns"
125
         systemctl restart cron
125
         systemctl restart cron
126
     fi
126
     fi
127
 
127
 

+ 1
- 1
src/freedombone-utils-gnusocialtools Näytä tiedosto

484
       echo "database_name=\$1";
484
       echo "database_name=\$1";
485
       echo "remove_user=\$2";
485
       echo "remove_user=\$2";
486
       echo "domain_name=\$3";
486
       echo "domain_name=\$3";
487
-      echo "MARIADB_PASSWORD=\$(freedombone-pass -u root -a mariadb)";
487
+      echo "MARIADB_PASSWORD=\$(${PROJECT_NAME}-pass -u root -a mariadb)";
488
       echo '';
488
       echo '';
489
       echo "if [ \${#remove_user} -lt 2 ]; then";
489
       echo "if [ \${#remove_user} -lt 2 ]; then";
490
       echo '  echo $"No user was specified"';
490
       echo '  echo $"No user was specified"';

+ 2
- 2
src/freedombone-utils-mesh Näytä tiedosto

182
     if [ ! -f /var/www/html/images/trifa.png ]; then
182
     if [ ! -f /var/www/html/images/trifa.png ]; then
183
         cp "/root/$PROJECT_NAME/img/trifa.png" /var/www/html/images/trifa.png
183
         cp "/root/$PROJECT_NAME/img/trifa.png" /var/www/html/images/trifa.png
184
     fi
184
     fi
185
-    if [ ! -f /var/www/html/freedombone.css ]; then
186
-        cp "/root/$PROJECT_NAME/website/freedombone.css" /var/www/html/freedombone.css
185
+    if [ ! -f "/var/www/html/${PROJECT_NAME}.css" ]; then
186
+        cp "/root/$PROJECT_NAME/website/${PROJECT_NAME}.css" "/var/www/html/${PROJECT_NAME}.css"
187
     fi
187
     fi
188
     chown -R www-data:www-data /var/www/html/*
188
     chown -R www-data:www-data /var/www/html/*
189
 }
189
 }

+ 2
- 2
src/freedombone-utils-wifi Näytä tiedosto

88
 
88
 
89
     atheros_drivers_file=drivers/firmware-ath9k-htc.deb
89
     atheros_drivers_file=drivers/firmware-ath9k-htc.deb
90
     if [ ! -f $atheros_drivers_file ]; then
90
     if [ ! -f $atheros_drivers_file ]; then
91
-        if [ ! -f ~/freedombone/$atheros_drivers_file ]; then
91
+        if [ ! -f "$HOME/${PROJECT_NAME}/$atheros_drivers_file" ]; then
92
             return
92
             return
93
         else
93
         else
94
-            atheros_drivers_file=~/freedombone/$atheros_drivers_file
94
+            atheros_drivers_file="$HOME/${PROJECT_NAME}/$atheros_drivers_file"
95
         fi
95
         fi
96
     else
96
     else
97
         atheros_drivers_file=$(pwd)/$atheros_drivers_file
97
         atheros_drivers_file=$(pwd)/$atheros_drivers_file