lksz
/
PowerShell_Scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some modifications 

Style default to slim theme
config updated to include bashrc
dcup, dcdown to work in parallel (supported by dco)
This commit is contained in:
lksz 2021-02-22 14:58:49 -05:00
parent c8869ae393
commit 4da3726760
8 changed files with 64 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/profile.d/Style.ps1
View File

@ -1,6 +1,6 @@
Get-Command Set-PSReadLineKeyHandler | ForEach-Object { Set-PSReadLineKeyHandler -Key Tab -Function MenuComplete }
if( Get-Command Set-PoshPrompt -ErrorAction SilentlyContinue ) {
$local:poshPrompt = Join-Path $HOME ".oh-my-posh.omp.json"
if( -not (Test-Path $poshPrompt) ) { $poshPrompt = "powerlevel10k_classic" }
if( -not (Test-Path $poshPrompt) ) { $poshPrompt = "slim" }
Set-PoshPrompt -Theme $poshPrompt
} elseif( Get-Command Set-Theme -ErrorAction SilentlyContinue ) { Set-Theme Paradox }

11
base/src/config.files.json
View File

@ -7,6 +7,12 @@
],
"vi": "~/.virc",
"omp": "~/.oh-my-posh.omp.json",
"profile": [
"~/.profile",
"/etc/profile",
"/etc/profile.d/"
],
"bashrc": "~/.bashrc",
"zshrc": "~/.zshrc",
"zsys": "/etc/zsys.conf",
"shrc": "~/.shrc",
@ -17,6 +23,11 @@
"@shell-loading-snippets/bash",
"@shell-loading-snippets/sh"
],
"sz-bashrc": [
"~/.sz.bashrc.sh",
"#bashrc",
"@shell-loading-snippets/bash"
],
"sz-zshrc": [
"~/.sz.zshrc.sh",
"#zshrc",

4
docker/Invoke-DockerCompose.ps1
View File

@ -8,7 +8,7 @@
)
[DockerComposeDirs]::_GetValidValues($wordToComplete,$true)
})]
[string[]]$ProjectPath=@($PWD),
[string[]]$ProjectPath,
[switch]$Recurse,
[int]$Depth=1,
[switch]$Force,
@ -17,6 +17,8 @@
[array]$CliParams
)
if( -not $ProjectPath ) { $ProjectPath=@($PWD) }
$script:JobQueue = @()
$script:CleanupJobQueue = @()
function CompleteJobs {

10
docker/dcdown.ps1
View File

@ -8,13 +8,15 @@
)
[DockerComposeDirs]::_GetValidValues($wordToComplete,$true)
})]
[string[]]$ProjectPath=@($PWD),
[string[]]$ProjectPath,
[switch]$Recurse,
[int]$Depth=1,
[Parameter(Position = 0, ValueFromRemainingArguments = $true)]
[array]$CliParams=@('--timeout=3','--volumes','--remove-orphans')
)
if( $CliParams[0] -is [string] ) { $CliParams = @($CliParams,@($null)) }
$CliParams[0] = @('down') + $CliParams[0]
if( -not $CliParams -or $CliParams[0] -is [string] ) { $CliParams = @($CliParams,@($null)) }
$CliParams[0] = @('&','down') + $CliParams[0]
Invoke-DockerCompose -ProjectPath $ProjectPath -CliParams $CliParams
Invoke-DockerCompose -ProjectPath $ProjectPath -CliParams $CliParams -Recurse:$Recurse -Depth $Depth

8
docker/dcup.ps1
View File

@ -46,10 +46,10 @@ if( -not $LogsParams[0] ) {
$local:moreParams = @()
#if( $ForceNoFollow ) { $moreParams = @('--no-color', '--quiet-pull') }
$PullParams[0] = @('pull' ) + $PullParams[0] + $Containers
if( $ForceNoFollow ) { $PullParams[0] = @('&') + $PullParams[0] }
$UpParams[0] = @('up' ) + $UpParams[0] + $Containers
if( $ForceNoFollow ) { $UpParams[0] = @('&') + $UpParams[0] }
$PullParams[0] = @('&', 'pull' ) + $PullParams[0] + $Containers
#if( $ForceNoFollow ) { $PullParams[0] = @('&') + $PullParams[0] }
$UpParams[0] = @('&', 'up' ) + $UpParams[0] + $Containers
#if( $ForceNoFollow ) { $UpParams[0] = @('&') + $UpParams[0] }
$LogsParams[0] = @('logs' ) + $LogsParams[0] + $Containers
if( -not $NoPull ) { $allParams += $PullParams + @(@('!')) }

12
shell-loading-snippets/bash
View File

@ -1,5 +1,5 @@
## Place the following line at the top of your .zshrc to make powershell your default shell.
# local P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$P -exec echo 'Starting PowerShell SZcripts...' \; && . ~/$P
## __P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$__P -exec true \; && . ~/$__P
if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]; then
PWSH='~/.dotnet/tools/pwsh'
@ -7,14 +7,16 @@ if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]
export DOTNET_CLI_TELEMETRY_OPTOUT=1
fi
echo "$(date) SZ_SKIP_DEFAULT_SHELL='$SZ_SKIP_DEFAULT_SHELL'; pwsh: $(which pwsh); Setup-Profile: $(ls ~/.local/share/powershell/Scripts/Setup-Profile.ps1) " >> /tmp/default_shell
if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" && "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then
if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" ]]; then
export SZ_SKIP_DEFAULT_SHELL=1
if [[ "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then
echo 'Starting PowerShell SZcripts...'
echo "pwsh" >> /tmp/default_shell
pwsh
exit
fi
fi
echo "continue" >> /tmp/default_shell
export SZ_SKIP_DEFAULT_SHELL=1

12
shell-loading-snippets/sh
View File

@ -1,5 +1,5 @@
## Place the following line at the top of your .zshrc to make powershell your default shell.
# local P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$P -exec echo 'Starting PowerShell SZcripts...' \; && . ~/$P
## __P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$__P -exec true \; && . ~/$__P
if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]; then
PWSH='~/.dotnet/tools/pwsh'
@ -7,14 +7,16 @@ if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]
export DOTNET_CLI_TELEMETRY_OPTOUT=1
fi
echo "$(date) SZ_SKIP_DEFAULT_SHELL='$SZ_SKIP_DEFAULT_SHELL'; pwsh: $(which pwsh); Setup-Profile: $(ls ~/.local/share/powershell/Scripts/Setup-Profile.ps1) " >> /tmp/default_shell
if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" && "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then
if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" ]]; then
export SZ_SKIP_DEFAULT_SHELL=1
if [[ "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then
echo 'Starting PowerShell SZcripts...'
echo "pwsh" >> /tmp/default_shell
pwsh
exit
fi
fi
echo "continue" >> /tmp/default_shell
export SZ_SKIP_DEFAULT_SHELL=1

10
shell-loading-snippets/zsh
View File

@ -1,5 +1,5 @@
## Place the following line at the top of your .zshrc to make powershell your default shell.
# local P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$P -exec echo 'Starting PowerShell SZcripts...' \; && . ~/$P
## __P=".local/share/powershell/Scripts/shell-loading-snippets/$(basename $SHELL)"; find ~/$__P -exec true \; && . ~/$__P
if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]; then
PWSH='~/.dotnet/tools/pwsh'
@ -7,13 +7,17 @@ if [[ -x ~/.dotnet/tools/pwsh && "1" != "$(which pwsh > /dev/null && echo 1)" ]]
export DOTNET_CLI_TELEMETRY_OPTOUT=1
fi
echo "$(date) SZ_SKIP_DEFAULT_SHELL='$SZ_SKIP_DEFAULT_SHELL'; pwsh: $(which pwsh); Setup-Profile: $(ls ~/.local/share/powershell/Scripts/Setup-Profile.ps1) " >> /tmp/default_shell
if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" && "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then
if [[ "$SZ_SKIP_DEFAULT_SHELL" != "1" ]]; then
export SZ_SKIP_DEFAULT_SHELL=1
if [[ "1" == "$(which pwsh > /dev/null && echo 1)" && -f ~/.local/share/powershell/Scripts/Setup-Profile.ps1 ]]; then
echo 'Starting PowerShell SZcripts...'
echo "pwsh" >> /tmp/default_shell
pwsh
exit
fi
fi
echo "continue" >> /tmp/default_shell
export SZ_SKIP_DEFAULT_SHELL=1