Skip to content

Commit 6b9fb69

Browse files
authored
Merge pull request #12 from iPromKnight/refactor/rclone_bin_name
refactor: env var for overriding rclone bin name
2 parents d0ca1a4 + b0f6785 commit 6b9fb69

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

src/internal/constants/constants.go

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package constants
22

33
// Constants for rclone
44
const (
5-
Rclone = "rclone"
65
Serve = "serve"
76
Mount = "mount"
87
MountPoint = "mountPoint="
@@ -28,8 +27,12 @@ const (
2827

2928
// Constants data files
3029
const (
31-
YAMLPathEnvVar = "RCLONE_MANAGER_CONFIG_YAML"
32-
DefaultYAMLPath = "/data/config.yaml"
30+
YAMLPathEnvVar = "RCLONE_MANAGER_CONFIG_YAML"
31+
DefaultYAMLPath = "/data/config.yaml"
32+
3333
RcloneConfEnvVar = "RCLONE_MANAGER_RCLONE_CONF"
3434
DefaultRcloneConf = "/data/rclone.conf"
35+
36+
RcloneBinaryNameEnvVar = "RCLONE_MANAGER_RCLONE_BIN_NAME"
37+
DefaultRcloneBinaryName = "rclone"
3538
)

src/internal/mount_manager/helpers.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import (
1313

1414
func createMountCommand(instance *MountProcess) *exec.Cmd {
1515
backendArg := fmt.Sprintf("%s:", instance.BackendName)
16+
rcloneBin := environment.GetEnvWithFallback(constants.RcloneBinaryNameEnvVar, constants.DefaultRcloneBinaryName)
1617

17-
cmd := exec.Command(
18-
constants.Rclone, constants.Mount, backendArg, instance.MountPoint)
18+
cmd := exec.Command(rcloneBin, constants.Mount, backendArg, instance.MountPoint)
1919
cmd.Stdout = os.Stdout
2020
cmd.Stderr = os.Stderr
2121

src/internal/serve_manager/helpers.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import (
1313

1414
func createServeCommand(instance *ServeProcess) *exec.Cmd {
1515
backendArg := fmt.Sprintf("%s:", instance.BackendName)
16-
17-
cmd := exec.Command(
18-
constants.Rclone, constants.Serve, instance.Protocol, backendArg, constants.Addr, instance.Addr)
16+
rcloneBin := environment.GetEnvWithFallback(constants.RcloneBinaryNameEnvVar, constants.DefaultRcloneBinaryName)
17+
cmd := exec.Command(rcloneBin, constants.Serve, instance.Protocol, backendArg, constants.Addr, instance.Addr)
1918
cmd.Stdout = os.Stdout
2019
cmd.Stderr = os.Stderr
2120

0 commit comments

Comments
 (0)