Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rclone update #935

Merged
merged 4 commits into from
Mar 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build/scripts/migration/service.d/casaos/migration.list
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion build/sysroot/usr/share/casaos/shell/helper.sh
Original file line number Diff 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
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
Expand All @@ -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
}

Expand All @@ -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
}

Expand Down
12 changes: 0 additions & 12 deletions drivers/all.go

This file was deleted.

30 changes: 0 additions & 30 deletions drivers/base/client.go

This file was deleted.

12 changes: 0 additions & 12 deletions drivers/base/types.go

This file was deleted.

100 changes: 0 additions & 100 deletions drivers/dropbox/drive.go

This file was deleted.

33 changes: 0 additions & 33 deletions drivers/dropbox/meta.go

This file was deleted.

88 changes: 0 additions & 88 deletions drivers/dropbox/types.go

This file was deleted.

Loading