Fix init process - reducing assumptions
This commit is contained in:
parent
9a15113955
commit
6c93527142
|
@ -15,7 +15,8 @@
|
|||
{{- $chassisType = "desktop" }}
|
||||
{{- end }}
|
||||
{{- else if eq .chezmoi.os "linux" }}
|
||||
{{- $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }}
|
||||
# $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }}
|
||||
{{- $chassisType = "server" }}
|
||||
{{- else if eq .chezmoi.os "windows" }}
|
||||
{{- $sysType = "windows" }}
|
||||
{{- $chassisType = (output "powershell.exe" "-NoProfile" "-NonInteractive" "-Command" "if ((Get-CimInstance -Class Win32_Battery | Measure-Object).Count -gt 0) { Write-Output 'laptop' } else { Write-Output 'desktop' }") | trim }}
|
||||
|
|
|
@ -7,6 +7,7 @@ cd "$CHEZMOI_SOURCE_DIR"
|
|||
#CZ_MODEL="$(ioreg -l | grep "product-name" | sed -Ee 's/^.*\<"(.*)\"\>.*$/\1/')"
|
||||
set | grep '^CZ_'
|
||||
printf 'System detected as %s/%s, setting up .chezmoiroot and initializing...\n' "$CZ_SYS" "$CZ_CHASSIS"
|
||||
set -x
|
||||
if [ -r "base.chezmoiroot.$CZ_SYS.$CZ_CHASSIS" ]; then
|
||||
ln -s "base.chezmoiroot.$CZ_SYS.$CZ_CHASSIS" .chezmoiroot
|
||||
elif [ -r "base.chezmoiroot.$CZ_SYS" ]; then
|
||||
|
|
|
@ -26,7 +26,8 @@
|
|||
{{- $chassisType = "desktop" }}
|
||||
{{- end }}
|
||||
{{- else if eq .chezmoi.os "linux" }}
|
||||
{{- $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }}
|
||||
# $chassisType = (output "hostnamectl" "--json=short" | mustFromJson).Chassis }}
|
||||
{{- $chassisType = "server" }}
|
||||
{{- else if eq .chezmoi.os "windows" }}
|
||||
{{- $sysType = "windows" }}
|
||||
{{- $sysVendor = "pc" }}
|
||||
|
|
|
@ -32,7 +32,7 @@ fi
|
|||
mkdir -p "$DEST_DIR"
|
||||
|
||||
# Find all directories and recreate them in the destination
|
||||
find "$SRC_DIR" -type d -mindepth 1 | while read -r dir; do
|
||||
find "$SRC_DIR" -mindepth 1 -type d | while read -r dir; do
|
||||
mkdir -p "$DEST_DIR/${dir#$SRC_DIR/}"
|
||||
done
|
||||
|
||||
|
|
Loading…
Reference in New Issue