Rclone update (IceWhaleTech#935)

jafarchoupan · Mar 6, 2023 · 449e151 · 449e151
1 parent e6ddb0d
commit 449e151
Show file tree

Hide file tree

Showing 47 changed files with 1,529 additions and 3,831 deletions.
diff --git a/build/scripts/migration/service.d/casaos/migration.list b/build/scripts/migration/service.d/casaos/migration.list
@@ -1,3 +1,4 @@
 LEGACY_WITHOUT_VERSION ${DOWNLOAD_DOMAIN}IceWhaleTech/CasaOS/releases/download/v0.3.6/linux-${ARCH}-casaos-migration-tool-v0.3.6.tar.gz
 v0.3.5 ${DOWNLOAD_DOMAIN}IceWhaleTech/CasaOS/releases/download/v0.3.6/linux-${ARCH}-casaos-migration-tool-v0.3.6.tar.gz
-v0.3.5.1 ${DOWNLOAD_DOMAIN}IceWhaleTech/CasaOS/releases/download/v0.3.6/linux-${ARCH}-casaos-migration-tool-v0.3.6.tar.gz
+v0.3.5.1 ${DOWNLOAD_DOMAIN}IceWhaleTech/CasaOS/releases/download/v0.3.6/linux-${ARCH}-casaos-migration-tool-v0.3.6.tar.gz
+v0.4.2 ${DOWNLOAD_DOMAIN}IceWhaleTech/CasaOS/releases/download/v0.4.3/linux-${ARCH}-casaos-migration-tool-v0.4.3.tar.gz
diff --git a/build/sysroot/usr/share/casaos/shell/helper.sh b/build/sysroot/usr/share/casaos/shell/helper.sh
@@ -25,7 +25,7 @@ GetNetCard() {
     fi
   else
     if [ -d "/sys/devices/virtual/net" ] && [ -d "/sys/class/net" ]; then
-      ls /sys/class/net/ | grep -v "$(ls /sys/devices/virtual/net/)"
+      ls /sys/class/net/ | grep -v "$(ls /sys/devices/virtual/net/)" -w
     fi
   fi
 }

diff --git a/cmd/migration-tool/migration_dummy.go → cmd/migration-tool/migration_042.go b/cmd/migration-tool/migration_dummy.go → cmd/migration-tool/migration_042.go
@@ -11,8 +11,11 @@
 package main
 
 import (
+	"os"
+
 	interfaces "github.com/IceWhaleTech/CasaOS-Common"
 	"github.com/IceWhaleTech/CasaOS-Common/utils/version"
+	"github.com/IceWhaleTech/CasaOS/pkg/utils/command"
 )
 
 type migrationTool struct{}
@@ -31,15 +34,15 @@ func (u *migrationTool) IsMigrationNeeded() (bool, error) {
 		return false, nil
 	}
 
-	if minorVersion > 3 {
+	if minorVersion > 4 {
 		return false, nil
 	}
 
-	if minorVersion == 3 && patchVersion > 5 {
+	if minorVersion == 4 && patchVersion != 2 {
 		return false, nil
 	}
 
-	_logger.Info("Migration is needed for a CasaOS version 0.3.5 and older...")
+	_logger.Info("Migration is needed for a CasaOS version 0.4.2 ")
 	return true, nil
 }
 
@@ -48,6 +51,10 @@ func (u *migrationTool) PreMigrate() error {
 }
 
 func (u *migrationTool) Migrate() error {
+	_logger.Info("Migration is started for a CasaOS version 0.4.2 ")
+	command.OnlyExec("systemctl stop rclone.service")
+	os.Remove("/usr/lib/systemd/system/rclone.service")
+	command.OnlyExec("systemctl daemon-reload")
 	return nil
 }
 

diff --git a/drivers/all.go b/drivers/all.go
diff --git a/drivers/base/client.go b/drivers/base/client.go
diff --git a/drivers/base/types.go b/drivers/base/types.go
diff --git a/drivers/dropbox/drive.go b/drivers/dropbox/drive.go
diff --git a/drivers/dropbox/meta.go b/drivers/dropbox/meta.go
diff --git a/drivers/dropbox/types.go b/drivers/dropbox/types.go
-Original file line number
+Diff line change
@@ Expand Up / @@ -25,7 +25,7 @@ GetNetCard() { @@
         fi
       else
         if [ -d "/sys/devices/virtual/net" ] && [ -d "/sys/class/net" ]; then
-          ls /sys/class/net/ | grep -v "$(ls /sys/devices/virtual/net/)"
+          ls /sys/class/net/ | grep -v "$(ls /sys/devices/virtual/net/)" -w
         fi
       fi
     }
@@ Expand Down @@