mirror of
https://github.com/seaweedfs/seaweedfs.git
synced 2026-10-31 17:30:42 +01:00
shell: expand ~ in local file path arguments (#9265)
* shell: expand `~` in local file path arguments The weed shell parses commands itself instead of going through an OS shell, so a path like `~/Downloads/foo.meta` was passed verbatim to `os.Open`, which fails because no `~` directory exists. Users had to spell out absolute home paths in every command. Add an `expandHomeDir` helper that resolves a leading `~` or `~/...` to the user's home directory, and run user-supplied local file paths in the affected shell commands through it: fs.meta.load (positional file) fs.meta.save (-o) fs.meta.changeVolumeId (-mapping) s3.iam.export (-file) s3.iam.import (-file) s3.policy (-file) s3tables.bucket (-file) s3tables.table (-file, -metadata) volume.fsck (-tempPath) Filer-namespace path flags (`-dir`, `-path`, `-locationPrefix`, etc.) are unaffected; they live in the filer, not on the local FS. * shell: reuse util.ResolvePath instead of a new helper util.ResolvePath already does tilde expansion; drop the local expandHomeDir helper and route every shell call site through it.
This commit is contained in:
1 parent
e2c8791441
commit
294f7c3d04
9 files changed
+19
-13
No files matched your search
@@ -9,6 +9,7 @@ import (
|
||||
"strings"
|
||||
|
||||
"github.com/seaweedfs/seaweedfs/weed/s3api/s3tables"
|
||||
"github.com/seaweedfs/seaweedfs/weed/util"
|
||||
)
|
||||
|
||||
func init() {
|
||||
@@ -108,7 +109,7 @@ func (c *commandS3TablesTable) Do(args []string, commandEnv *CommandEnv, writer
|
||||
case *create:
|
||||
var metadata *s3tables.TableMetadata
|
||||
if *metadataFile != "" {
|
||||
content, err := os.ReadFile(*metadataFile)
|
||||
content, err := os.ReadFile(util.ResolvePath(*metadataFile))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -178,7 +179,7 @@ func (c *commandS3TablesTable) Do(args []string, commandEnv *CommandEnv, writer
|
||||
if *policyFile == "" {
|
||||
return fmt.Errorf("-file is required")
|
||||
}
|
||||
content, err := os.ReadFile(*policyFile)
|
||||
content, err := os.ReadFile(util.ResolvePath(*policyFile))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user