diff --git a/scripts/Arch/Software/rclone/main.fish b/scripts/Arch/Software/rclone/main.fish index 2eec2d34..8a127b01 100755 --- a/scripts/Arch/Software/rclone/main.fish +++ b/scripts/Arch/Software/rclone/main.fish @@ -1,6 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) + set -l base "$dir/../../../Common/Software/rclone/main.fish" source "$dir/../../Scripts/software.fish" source "$dir/../../../Common/Software/rclone/main.fish" @@ -9,8 +10,12 @@ begin rclone end - function configureSW -V dir - fish "$dir/../../../Common/Software/rclone/main.fish" configure + function configureSW -V base + fish "$base" configure + end + + function userConfig -V base -a name + fish "$base" userConfig $argv end runInstaller $argv diff --git a/scripts/Common/Software/rclone/main.fish b/scripts/Common/Software/rclone/main.fish index 60c8c4a6..8ab75439 100755 --- a/scripts/Common/Software/rclone/main.fish +++ b/scripts/Common/Software/rclone/main.fish @@ -9,7 +9,7 @@ begin function userConfig -V dir -a name source "$dir/../../Scripts/config.fish" - set -l key "valhalla.users.$name.rclone.configurations" + set -l key "valhalla.linux.users.$name.rclone.configurations" set -l configs (getConfig "$key" --apply "builtins.attrNames" --json) if [ (echo "$configs" | jq "length") -gt 0 ]