浏览代码

Ensure that the latest version of tahoe-lafs is used

Bob Mottram 8 年前
父节点
当前提交
98bdf8eb7c
共有 2 个文件被更改,包括 8 次插入2 次删除
  1. 5
    2
      src/freedombone-app-tahoelafs
  2. 3
    0
      src/freedombone-image-mesh

+ 5
- 2
src/freedombone-app-tahoelafs 查看文件

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

+ 3
- 0
src/freedombone-image-mesh 查看文件

522
     chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/autostart
522
     chown -R ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/.config/autostart
523
     chown ${MY_USERNAME}:${MY_USERNAME} /home/$MY_USERNAME/*.sh
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
     # restart caja
528
     # restart caja
526
     killall caja
529
     killall caja
527
     killall mate-panel
530
     killall mate-panel