Browse Source

Ensure that the latest version of tahoe-lafs is used

Bob Mottram 8 years ago
parent
commit
98bdf8eb7c
2 changed files with 8 additions and 2 deletions
  1. 5
    2
      src/freedombone-app-tahoelafs
  2. 3
    0
      src/freedombone-image-mesh

+ 5
- 2
src/freedombone-app-tahoelafs View File

@@ -141,6 +141,7 @@ function remove_tahoelafs {
141 141
     function_check save_firewall_settings
142 142
     save_firewall_settings
143 143
 
144
+    pip uninstall tahoe-lafs
144 145
     apt-get -y remove --purge tahoe-lafs
145 146
 
146 147
     sed -i '/install_tahoelafs/d' $COMPLETION_FILE
@@ -207,7 +208,8 @@ function tahoelafs_update_script {
207 208
 }
208 209
 
209 210
 function mesh_install_tahoelafs {
210
-    chroot "$rootdir" apt-get -y install tahoe-lafs
211
+    chroot "$rootdir" apt-get -y install python-pip tahoe-lafs
212
+    chroot "$rootdir" pip install tahoe-lafs
211 213
     chroot "$rootdir" su -c 'tahoe create-client' - $MY_USERNAME
212 214
     if [ ! -d $rootdir/home/$MY_USERNAME/.tahoe ]; then
213 215
         exit 63722
@@ -229,7 +231,8 @@ function install_tahoelafs {
229 231
         return
230 232
     fi
231 233
 
232
-    apt-get -y install tahoe-lafs
234
+    apt-get -y install python-pip tahoe-lafs
235
+    pip install tahoe-lafs
233 236
     configure_firewall_for_tahoelafs
234 237
     reconfigure_tahoelafs
235 238
     tahoelafs_update_script /usr/bin/update-tahoelafs

+ 3
- 0
src/freedombone-image-mesh View File

@@ -522,6 +522,9 @@ function show_desktop_icons {
522 522
     chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/autostart
523 523
     chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/*.sh
524 524
 
525
+    # link to Tahoe-LAFS Magic folder
526
+    ln -s /home/${MY_USERNAME}/Desktop/${TAHOELAFS_SHARED_DIR} /home/${MY_USERNAME}/${TAHOELAFS_SHARED_DIR}
527
+
525 528
     # restart caja
526 529
     killall caja
527 530
     killall mate-panel