Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "skill-manager",
"private": true,
"version": "0.2.0",
"version": "0.2.1",
"type": "module",
"scripts": {
"dev": "VITE_API_BASE=/api vite --host 127.0.0.1 --port 5173",
Expand Down
2 changes: 1 addition & 1 deletion packaging/npm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mode-io/skill-manager",
"version": "0.2.0",
"version": "0.2.1",
"description": "Public macOS installer wrapper for the Mode IO skill-manager native release artifact.",
"license": "MIT",
"private": false,
Expand Down
20 changes: 12 additions & 8 deletions packaging/npm/scripts/channel-ownership.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,38 +38,42 @@ function packageRootPath() {
return path.resolve(__dirname, "..");
}

function isNonEmptyDirectory(directory) {
try {
return fs.statSync(directory).isDirectory() && fs.readdirSync(directory).length > 0;
} catch {
return false;
}
}

function detectHomebrewInstall() {
const prefixes = new Set();
const envPrefix = String(process.env.HOMEBREW_PREFIX || "").trim();
if (envPrefix) {
prefixes.add(envPrefix);
}
prefixes.add("/opt/homebrew");
prefixes.add("/usr/local");

const brewPrefix = spawnSync("brew", ["--prefix"], { encoding: "utf8" });
if (brewPrefix.status === 0 && brewPrefix.stdout.trim()) {
prefixes.add(brewPrefix.stdout.trim());
} else {
prefixes.add("/opt/homebrew");
prefixes.add("/usr/local");
}

const brewList = spawnSync("brew", ["list", "--versions", "skill-manager"], { encoding: "utf8" });
if (brewList.status === 0 && brewList.stdout.trim()) {
return true;
}

const formulaPrefix = spawnSync("brew", ["--prefix", "skill-manager"], { encoding: "utf8" });
if (formulaPrefix.status === 0 && formulaPrefix.stdout.trim()) {
return true;
}

for (const prefix of prefixes) {
if (!prefix) {
continue;
}
if (fs.existsSync(path.join(prefix, "opt", "skill-manager"))) {
return true;
}
if (fs.existsSync(path.join(prefix, "Cellar", "skill-manager"))) {
if (isNonEmptyDirectory(path.join(prefix, "Cellar", "skill-manager"))) {
return true;
}
}
Expand Down
33 changes: 33 additions & 0 deletions scripts/validate_npm_wrapper.sh
Original file line number Diff line number Diff line change
Expand Up @@ -194,4 +194,37 @@ if [[ "$RUNTIME_CONFLICT_OUTPUT" != *"skill-manager is already installed via Hom
exit 1
fi

TAPPED_BREW_ROOT="$TMP_DIR/tapped-homebrew"
TAPPED_BIN_DIR="$TMP_DIR/tapped-bin"
mkdir -p "$TAPPED_BREW_ROOT" "$TAPPED_BIN_DIR"
cat >"$TAPPED_BIN_DIR/brew" <<EOF
#!/usr/bin/env bash
set -euo pipefail
if [[ "\${1:-}" == "--prefix" && \$# -eq 1 ]]; then
printf '%s\n' "$TAPPED_BREW_ROOT"
exit 0
fi
if [[ "\${1:-}" == "--prefix" && "\${2:-}" == "skill-manager" ]]; then
printf '%s\n' "$TAPPED_BREW_ROOT/opt/skill-manager"
exit 0
fi
if [[ "\${1:-}" == "list" && "\${2:-}" == "--versions" && "\${3:-}" == "skill-manager" ]]; then
exit 1
fi
exit 1
EOF
chmod +x "$TAPPED_BIN_DIR/brew"

PATH="$TAPPED_BIN_DIR:$PATH" \
npm install --global --prefix "$TMP_DIR/tapped-global-prefix" "./$PACK_FILE" >/dev/null

TAPPED_VERSION_OUTPUT="$(
PATH="$TAPPED_BIN_DIR:$PATH" \
"$TMP_DIR/tapped-global-prefix/bin/skill-manager" --version
)"
if [[ ! "$TAPPED_VERSION_OUTPUT" =~ ^skill-manager[[:space:]][0-9]+\.[0-9]+\.[0-9]+ ]]; then
echo "Tapped-but-uninstalled Homebrew case unexpectedly blocked npm wrapper: $TAPPED_VERSION_OUTPUT" >&2
exit 1
fi

"$TMP_DIR/node_modules/.bin/skill-manager" stop --state-dir "$TMP_DIR/runtime" >/dev/null
2 changes: 1 addition & 1 deletion skill_manager/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.2.0
0.2.1