new rclone version 1.52

README.md

@@ -253,6 +253,10 @@ Neither the author nor developer's will be held responsible for any damage/data
 ---
 ## Changelog
 
+## v1.11
+* Add arm/arm64 1.52 bins downloaded from https://beta.rclone.org/v1.52.0/testbuilds/rclone-android-16-arm.gz
+* Fixed service.sh paths
+
 ## v1.10
 * fixed fusermount wrapper
 

binary/rclone-wrapper.sh

@@ -1,6 +1,6 @@
 #!/system/bin/sh
 
-MODDIR=${0%/*}
+MODDIR="$(dirname "$(readlink -f "$0")")"
 UPDDIR=/data/adb/modules_update
 IMGDIR=/sbin/.core/img
 id=com.piyushgarg.rclone
@@ -21,23 +21,49 @@ SD_BINDPOINT=${BINDPOINT_D}
 CLOUDROOTMOUNTPOINT=/mnt/cloud
 
 SCRIPTPID=$$
-
 export INTERACTIVE=1
 
-if [ -e ${UPDDIR}/${id}/rclone ]; then
+## resolve links - $0 may be a link to module home
+PRG="$0"
 
+# need this for relative symlinks
+while [ -h "$PRG" ] ; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG="`dirname "$PRG"`/$link"
+  fi
+done
+
+echo $PRG
+
+saveddir=`pwd`
+
+MODDIR2=`dirname "$PRG"`
+
+# make it fully qualified
+MODDIR2=`cd "$MODIR2" && pwd`
+
+cd "$saveddir"
+#echo $MODDIR2
+
+if [ -e ${UPDDIR}/${id}/rclone ]; then
     HOME=${UPDDIR}/${id}
 
 elif [ -e ${IMGDIR}/${id}/rclone ]; then
-
     HOME=${IMGDIR}/${id}
 
+elif [ -e ${MODDIR2}/${id}/rclone ]; then
+    HOME=${MODDIR2}/${id}
+
 else
-
     HOME=${MODDIR}
-
 fi
 
+echo $HOME
+
 CONFIGFILE=${HOME}/.config/rclone/rclone.conf
 
 custom_params () {
@@ -169,14 +195,11 @@ sd_unbind_func () {
 
 sd_unbind () {
 
-    ${HOME}/rclone listremotes --config                 ${CONFIGFILE}|cut -f1 -d: |
-
-        while read remote; do
-
+    ${HOME}/rclone listremotes --config ${CONFIGFILE} | cut -f1 -d: | while read remote; do
                 echo
-
                 custom_params
                 sd_unbind_func
+
         done >> /dev/null 2>&1
 }
 

common/service.sh

@@ -7,29 +7,51 @@
 
 PATH=/system/bin:/sbin:/sbin/.core/busybox:/system/xbin
 
-MODDIR=${0%/*}
+MODDIR="$(dirname "$(readlink -f "$0")")"
 
 IMGDIR=/sbin/.core/img
 UPDDIR=/data/adb/modules_update
 id=com.piyushgarg.rclone
 
-if [ -e ${UPDDIR}/${id}/rclone-wrapper.sh ]; then
+## resolve links - $0 may be a link to module home
+PRG="$0"
 
+# need this for relative symlinks
+while [ -h "$PRG" ] ; do
+  ls=`ls -ld "$PRG"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    PRG="$link"
+  else
+    PRG="`dirname "$PRG"`/$link"
+  fi
+done
+
+saveddir=`pwd`
+MODDIR2=`dirname "$PRG"`
+# make it fully qualified
+MODDIR2=`cd "$MODIR2" && pwd`
+cd "$saveddir"
+#echo 3 $MODDIR2
+
+if [ -e ${UPDDIR}/${id}/rclone ]; then
     HOME=${UPDDIR}/${id}
 
-elif [ -e ${IMGDIR}/${id}/rclone-wrapper.sh ]; then
-
+elif [ -e ${IMGDIR}/${id}/rclone ]; then
     HOME=${IMGDIR}/${id}
 
+elif [ -e ${MODDIR2}/${id}/rclone ]; then
+    HOME=${MODDIR2}/${id}
+
 else
-
     HOME=${MODDIR}
-
 fi
 
-ln -sf ${HOME}/rclone-wrapper.sh /sbin/rclone
-ln -sf ${HOME}/fusermount /sbin/fusermount
+echo $HOME
 
+ln -sf ${HOME}/rclone /sbin/rclone
+ln -sf ${HOME}/fusermount /sbin/fusermount
+ln -sf ${HOME}/rclone-wrapper.sh /sbin/rclonew
 
 #MODULE VARS
 SYSBIN=/system/bin

install.sh

@@ -184,7 +184,11 @@ set_permissions() {
   set_perm $MODPATH/rclone-wrapper.sh 0 0 0755
   set_perm $MODPATH/syncd.sh 0 0 0755
   set_perm $MODPATH/inotifywait 0 0 0555
-  ln -sf $MODPATH/rclone-wrapper.sh /sbin/rclone
+
+  ln -sf $MODPATH/rclone /sbin/rclone
+  ln -sf $MODPATH/rclone-wrapper.sh /sbin/rclonew
+  ln -sf $MODPATH/fusermount /sbin/fusermount
+
   ui_print "✓ Now no need to reboot..."
   ui_print "+ Attempting to mount your [Remotes]:"
   ui_print "+ please wait..."

module.prop

@@ -1,8 +1,8 @@
 id=com.piyushgarg.rclone
 name=rclone-mount
-modVer=1.10
-BinVer=1.51.0
-version=rclone: (v1.51.0) mod: (v1.10)
-versionCode=107
+modVer=1.11
+BinVer=1.52.0
+version=rclone: (v1.52.0) mod: (v1.11)
+versionCode=111
 author=piyushgarg @ github.com
 description=Mount cloud storage locally using rclone & fusermount. Virtually limitless storage expansion with support for dozens of cloud providers. Extremely useful for streaming large media files without need for full caching. Binaries obtained directly from rclone.org. Please refer to README.md for more info.