diff --git a/scripts/Common/Config/aliae/install.ps1 b/scripts/Common/Config/aliae/install.ps1 new file mode 100644 index 00000000..98690aaf --- /dev/null +++ b/scripts/Common/Config/aliae/install.ps1 @@ -0,0 +1,4 @@ +#!/bin/pwsh +. "$PSScriptRoot/../powershell/profile.ps1"; + +Add-PowerShellProfileStatement -Statement "# aliae`naliae init pwsh | Invoke-Expression"; diff --git a/scripts/Common/Config/aliae/install.sh b/scripts/Common/Config/aliae/install.sh index d87edef2..43ec8d27 100755 --- a/scripts/Common/Config/aliae/install.sh +++ b/scripts/Common/Config/aliae/install.sh @@ -1,9 +1,6 @@ #!/bin/bash -SKIP_POWERSHELL=${SKIP_POWERSHELL:-0}; pushd "${BASH_SOURCE%/*}" > /dev/null; -. "../../Scripts/is-truthy.sh"; - if ! grep "\baliae\b" ~/.bashrc > /dev/null then { @@ -13,15 +10,11 @@ then } >> ~/.bashrc; fi; -if ! isTruthy "${SKIP_POWERSHELL}" -then - profileFile="$(pwsh -c '$PROFILE')"; +profileFile="$(pwsh -c '$PROFILE')"; - if [ ! -f "$profileFile" ] || ! grep "\baliae\b" "$profileFile" > /dev/null - then - install -dm755 "$(dirname "$profileFile")"; - echo "aliae init pwsh | Invoke-Expression" >> "$profileFile"; - fi; +if [ ! -f "$profileFile" ] || ! grep "\baliae\b" "$profileFile" > /dev/null +then + pwsh "./install.ps1"; fi; echo 'aliae init fish | source' | sudo tee /etc/fish/conf.d/aliae.fish > /dev/null; diff --git a/scripts/Windows/Config/aliae/Install.ps1 b/scripts/Windows/Config/aliae/Install.ps1 index 162db799..fef7e91a 100644 --- a/scripts/Windows/Config/aliae/Install.ps1 +++ b/scripts/Windows/Config/aliae/Install.ps1 @@ -12,10 +12,9 @@ Set-Content $script ( [string]::Join( "`n", @( - "SKIP_POWERSHELL=1 bash `"$PSScriptRoot/../../../Common/Config/aliae/install.sh`"", + "bash `"$PSScriptRoot/../../../Common/Config/aliae/install.sh`"", "rm ~/.bashrc"))); -$context.AddPowerShellProfileStatement("# aliae`naliae init pwsh | Invoke-Expression"); Write-Information "Running prepared script"; Start-Process -Wait $script; Remove-Item $script; \ No newline at end of file