v1.13.3

Author: llycoris

clash_service.sh

@@ -7,4 +7,4 @@ done
 
 chmod 755 /data/clash/scripts/start.sh
 /data/clash/scripts/start.sh
-)&
+)&

customize.sh

@@ -17,18 +17,16 @@ clash_data_dir_kernel="${clash_data_dir}/kernel"
 clash_data_sc="${clash_data_dir}/scripts"
 mod_config="${clash_data_sc}/clash.config"
 yacd_dir="${clash_data_dir}/dashboard"
+latest=$(date +%Y%m%d%H%M)
 
 if [ $BOOTMODE ! = true ] ; then
   abort "error: please install in magisk manager"
 fi
 
 if [ -d "${clash_data_dir}" ] ; then
     ui_print "- Clash folder found, Backup Clash"
-    if [ -d "${clash_data_dir}/clash.backup" ] ; then
-        rm -rf ${clash_data_dir}/clash.backup
-    fi
-    mkdir -p ${clash_data_dir}/clash.backup
-    mv ${clash_data_dir}/* ${clash_data_dir}/clash.backup/
+    mkdir -p ${clash_data_dir}/${latest}
+    mv ${clash_data_dir}/* ${clash_data_dir}/${latest}/
 fi
 
 ui_print "- Create folder Clash."
@@ -39,7 +37,6 @@ mkdir -p ${clash_data_dir}/dashboard
 mkdir -p ${MODPATH}/system/bin
 mkdir -p ${clash_data_dir}/run
 mkdir -p ${clash_data_dir}/scripts
-mkdir -p ${clash_data_dir}/proxy-provider
 mkdir -p ${clash_data_dir}/mosdns
 
 case "${ARCH}" in
@@ -59,14 +56,10 @@ esac
 
 unzip -o "${ZIPFILE}" -x 'META-INF/*' -d $MODPATH >&2
 
-ui_print "- Unzip file Dashboard"
-if [ ! -d /data/dashboard ] ; then
-    rm -rf "${clash_data_dir}/dashboard/*"
-fi
+ui_print "- Unzip Dashboard"
 unzip -o ${MODPATH}/dashboard.zip -d ${clash_data_dir}/dashboard/ >&2
 
 ui_print "- Move Scripts Clash"
-rm -rf "${clash_data_dir}/scripts/*"
 mv ${MODPATH}/scripts/* ${clash_data_dir}/scripts/
 mv ${clash_data_dir}/scripts/template ${clash_data_dir}/
 
@@ -79,6 +72,7 @@ if [ ! -d /data/adb/service.d ] ; then
     mkdir -p /data/adb/service.d
 fi
 
+ui_print "- Create resolv.conf"
 if [ ! -f "${dns_path}/resolv.conf" ] ; then
     touch ${MODPATH}${dns_path}/resolv.conf
     echo nameserver 8.8.8.8 > ${MODPATH}${dns_path}/resolv.conf
@@ -91,18 +85,9 @@ if [ ! -f "${clash_data_dir}/scripts/packages.list" ] ; then
     touch ${clash_data_dir}/packages.list
 fi
 
-ui_print "- Execute Zipfile"
-if [ ! -f "${MODPATH}/service.sh" ] ; then
-    unzip -j -o "${ZIPFILE}" 'service.sh' -d ${MODPATH} >&2
-fi
-
-if [ ! -f "${MODPATH}/uninstall.sh" ] ; then
-    unzip -j -o "${ZIPFILE}" 'uninstall.sh' -d ${MODPATH} >&2
-fi
-
-if [ ! -f "${clash_service_dir}/clash_service.sh" ] ; then
-    unzip -j -o "${ZIPFILE}" 'clash_service.sh' -d ${clash_service_dir} >&2
-fi
+unzip -j -o "${ZIPFILE}" 'service.sh' -d ${MODPATH} >&2
+unzip -j -o "${ZIPFILE}" 'uninstall.sh' -d ${MODPATH} >&2
+unzip -j -o "${ZIPFILE}" 'clash_service.sh' -d ${clash_service_dir} >&2
 
 ui_print "- Unzip $ARCH Execute files"
 tar -xjf ${MODPATH}/binary/${ARCH}.tar.bz2 -C ${clash_data_dir_kernel}/&& echo "- extar kernel Succes" || echo "- extar kernel gagal"
@@ -125,10 +110,11 @@ rm -rf ${MODPATH}/GeoX
 rm -rf ${MODPATH}/binary
 rm -rf ${MODPATH}/clash_service.sh
 rm -rf ${clash_data_dir}/scripts/config.yaml
+rm -rf ${clash_data_dir_kernel}/curl
 
 sleep 1
 
-ui_print "- Arrange Permissons"
+ui_print "- Set Permissons"
 set_perm_recursive ${MODPATH} 0 0 0755 0644
 set_perm_recursive ${clash_service_dir} 0 0 0755 0755
 set_perm_recursive ${clash_data_dir} ${uid} ${gid} 0755 0644

module.prop

@@ -1,7 +1,7 @@
 id=ClashForMagisk
 name=Clash for Magisk
-version=v1.13.2
-versionCode=20220923
+version=v1.13.3
+versionCode=20220929
 author=t🍀amarin
 description= Use iptables to support Clash's transparent proxy. Hey, damn half-crippled Android!!!
 updateJson=https://github.com/taamarin/ClashforMagisk/raw/master/update.json

update.json

@@ -1,6 +1,6 @@
 {
-    "version": "v1.13.2",
-    "versionCode": "20220923",
-    "zipUrl": "https://github.com/taamarin/ClashforMagisk/releases/download/v1.13.2/ClashForMagisk.v1.13.2.meta-prem.zip",
+    "version": "v1.13.3",
+    "versionCode": "20220929",
+    "zipUrl": "https://github.com/taamarin/ClashforMagisk/releases/download/v1.13.3/Clash_for_Magisk-v1.13.3.zip",
     "changelog": "https://github.com/taamarin/ClashforMagisk/raw/master/CHANGELOG.md"
-}
+}