Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e6a85a9fb6 | ||
|
|
4f4268efb3 | ||
|
|
95246baaec | ||
|
|
1eadb00989 | ||
|
|
81bd495af9 |
@@ -20,6 +20,8 @@ jobs:
|
|||||||
|
|
||||||
- name: Build dist
|
- name: Build dist
|
||||||
run: make dist
|
run: make dist
|
||||||
|
env:
|
||||||
|
SOFTKAT_BUILD_COMMIT: ${{ github.sha }}
|
||||||
|
|
||||||
- name: Package release zip
|
- name: Package release zip
|
||||||
run: |
|
run: |
|
||||||
|
|||||||
@@ -83,5 +83,7 @@ C:\ProgramData\__Softwarekatalog\Failed\
|
|||||||
## Notes
|
## Notes
|
||||||
|
|
||||||
- Requires Windows, Desktop App Installer, and `winget`.
|
- Requires Windows, Desktop App Installer, and `winget`.
|
||||||
|
- Catalog installs, uninstalls, exports, and automatic upgrades explicitly target
|
||||||
|
the `winget` community source, so an unavailable Microsoft Store source does not block them.
|
||||||
- SYSTEM scheduled tasks validate and execute requests; keep catalog policy restricted to trusted admins.
|
- SYSTEM scheduled tasks validate and execute requests; keep catalog policy restricted to trusted admins.
|
||||||
- Package IDs and silent machine-scope support depend on upstream `winget` packages.
|
- Package IDs and silent machine-scope support depend on upstream `winget` packages.
|
||||||
|
|||||||
+17
-2
@@ -4,16 +4,31 @@ set -euo pipefail
|
|||||||
src="${1:-setup.ps1}"
|
src="${1:-setup.ps1}"
|
||||||
out="${2:-dist/setup.ps1}"
|
out="${2:-dist/setup.ps1}"
|
||||||
out_dir="$(dirname "$out")"
|
out_dir="$(dirname "$out")"
|
||||||
|
build_commit="${SOFTKAT_BUILD_COMMIT:-${GITHUB_SHA:-}}"
|
||||||
|
|
||||||
|
if [ -z "$build_commit" ] && git rev-parse --verify HEAD >/dev/null 2>&1; then
|
||||||
|
build_commit="$(git rev-parse HEAD)"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -z "$build_commit" ]; then
|
||||||
|
build_commit="unknown"
|
||||||
|
fi
|
||||||
|
|
||||||
mkdir -p "$out_dir"
|
mkdir -p "$out_dir"
|
||||||
|
|
||||||
|
payload_src="$(mktemp)"
|
||||||
|
trap 'rm -f "$payload_src"' EXIT
|
||||||
|
printf '# Softwarekatalog build commit: %s\n' "$build_commit" > "$payload_src"
|
||||||
|
cat "$src" >> "$payload_src"
|
||||||
|
|
||||||
if base64 --help 2>&1 | grep -q -- '-w'; then
|
if base64 --help 2>&1 | grep -q -- '-w'; then
|
||||||
payload="$(base64 -w 0 "$src")"
|
payload="$(base64 -w 0 "$payload_src")"
|
||||||
else
|
else
|
||||||
payload="$(base64 "$src" | tr -d '\n')"
|
payload="$(base64 "$payload_src" | tr -d '\n')"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
cat > "$out" <<EOF
|
cat > "$out" <<EOF
|
||||||
|
# Softwarekatalog build commit: $build_commit
|
||||||
# ASCII-only bootstrap generated from setup.ps1. Do not edit.
|
# ASCII-only bootstrap generated from setup.ps1. Do not edit.
|
||||||
[CmdletBinding()]
|
[CmdletBinding()]
|
||||||
param(
|
param(
|
||||||
|
|||||||
Reference in New Issue
Block a user