diff --git a/scripts/Arch/Software/git/main.fish b/scripts/Arch/Software/git/main.fish index cc6d0bc3..929ce2c6 100755 --- a/scripts/Arch/Software/git/main.fish +++ b/scripts/Arch/Software/git/main.fish @@ -1,6 +1,7 @@ #!/bin/env fish begin set -l dir (status dirname) + set -l base "$dir/../../../Common/Software/git/main.fish" source "$dir/../../Scripts/software.fish" function installSW @@ -13,8 +14,12 @@ begin gitflow-zshcompletion-avh end - function configureSW -V dir - fish "$dir/../../../Common/Software/git/main.fish" configure + function configureSW -V base + fish "$base" configure + end + + function userConfig -V base + fish "$base" userConfig $argv end runInstaller $argv diff --git a/scripts/Common/Software/git/Manage.ps1 b/scripts/Common/Software/git/Manage.ps1 index 59e2cc27..d8d258b7 100644 --- a/scripts/Common/Software/git/Manage.ps1 +++ b/scripts/Common/Software/git/Manage.ps1 @@ -7,7 +7,7 @@ param ( . "$PSScriptRoot/../../Scripts/System.ps1"; . "$PSScriptRoot/../../Types/InstallerAction.ps1"; -$null = New-Module { +& { param( [hashtable] $Parameters ) diff --git a/scripts/Common/Software/git/main.fish b/scripts/Common/Software/git/main.fish index 48ba366d..c78f9ba5 100755 --- a/scripts/Common/Software/git/main.fish +++ b/scripts/Common/Software/git/main.fish @@ -8,7 +8,7 @@ begin end function userConfig -S -V dir -a name - configureGit "$name" + pwsh -CommandWithArgs '& $args[0] ConfigureUser @{ user=$args[1]; }' "$dir/Manage.ps1" $name end runInstaller $argv