extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-12-22 23:22:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

mount: fix volume name broken in recent refactor

Browse Source
This commit is contained in:
Nick Craig-Wood 2020-07-29 14:23:00 +01:00
parent 4441e012cf
commit 3daa63cae8
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
cmd/mountlib/mount.go
View File

@ -339,8 +339,9 @@ be copied to the vfs cache before opening with --vfs-cache-mode full.
` + vfs.Help, ` + vfs.Help,
Run: func(command *cobra.Command, args []string) { Run: func(command *cobra.Command, args []string) {
cmd.CheckArgs(2, 2, command, args) cmd.CheckArgs(2, 2, command, args)
opt := Opt // make a copy of the options
if Opt.Daemon { if opt.Daemon {
config.PassConfigKeyForDaemonization = true config.PassConfigKeyForDaemonization = true
} }
@ -360,30 +361,29 @@ be copied to the vfs cache before opening with --vfs-cache-mode full.
// Skip checkMountEmpty if --allow-non-empty flag is used or if // Skip checkMountEmpty if --allow-non-empty flag is used or if
// the Operating System is Windows // the Operating System is Windows
if !Opt.AllowNonEmpty && runtime.GOOS != "windows" { if !opt.AllowNonEmpty && runtime.GOOS != "windows" {
err := checkMountEmpty(mountpoint) err := checkMountEmpty(mountpoint)
if err != nil { if err != nil {
log.Fatalf("Fatal error: %v", err) log.Fatalf("Fatal error: %v", err)
} }
} else if Opt.AllowNonEmpty && runtime.GOOS == "windows" { } else if opt.AllowNonEmpty && runtime.GOOS == "windows" {
fs.Logf(nil, "--allow-non-empty flag does nothing on Windows") fs.Logf(nil, "--allow-non-empty flag does nothing on Windows")
} }
// Work out the volume name, removing special // Work out the volume name, removing special
// characters from it if necessary // characters from it if necessary
VolumeName := Opt.VolumeName if opt.VolumeName == "" {
if VolumeName == "" { opt.VolumeName = fdst.Name() + ":" + fdst.Root()
VolumeName = fdst.Name() + ":" + fdst.Root()
} }
VolumeName = strings.Replace(VolumeName, ":", " ", -1) opt.VolumeName = strings.Replace(opt.VolumeName, ":", " ", -1)
VolumeName = strings.Replace(VolumeName, "/", " ", -1) opt.VolumeName = strings.Replace(opt.VolumeName, "/", " ", -1)
VolumeName = strings.TrimSpace(VolumeName) opt.VolumeName = strings.TrimSpace(opt.VolumeName)
if runtime.GOOS == "windows" && len(VolumeName) > 32 { if runtime.GOOS == "windows" && len(opt.VolumeName) > 32 {
VolumeName = VolumeName[:32] opt.VolumeName = opt.VolumeName[:32]
} }
// Start background task if --background is specified // Start background task if --background is specified
if Opt.Daemon { if opt.Daemon {
daemonized := startBackgroundMode() daemonized := startBackgroundMode()
if daemonized { if daemonized {
return return
@ -391,7 +391,7 @@ be copied to the vfs cache before opening with --vfs-cache-mode full.
} }
VFS := vfs.New(fdst, &vfsflags.Opt) VFS := vfs.New(fdst, &vfsflags.Opt)
err := Mount(VFS, mountpoint, mount, &Opt) err := Mount(VFS, mountpoint, mount, &opt)
if err != nil { if err != nil {
log.Fatalf("Fatal error: %v", err) log.Fatalf("Fatal error: %v", err)
} }