philologue/diachron
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update shell code

Browse Source 
Now it (mostly) passes shellcheck and is formatted with shfmt.
This commit is contained in:
Michael Wolf
2025-11-17 11:38:04 -06:00
parent 1a13fd0909
commit 2641a8d29d
11 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd
View File

@@ -6,7 +6,7 @@
set -eu
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
subcmd="$1"
@@ -16,6 +16,6 @@ subcmd="$1"
shift
echo will run "$DIR"/framework/cmd.d/"$subcmd" "$@"
echo will run "$DIR"/framework/cmd.d/"$subcmd" "$@"
exec "$DIR"/framework/cmd.d/"$subcmd" "$@"

2
express/watch.sh
View File

@@ -11,4 +11,4 @@ source "$check_dir"/../framework/shims/node.common
# $ROOT/cmd pnpm tsc --lib ES2023 --esModuleInterop -w $check_dir/app.ts
# $ROOT/cmd pnpm tsc -w $check_dir/app.ts
$ROOT/cmd pnpm tsc -w --project ./tsconfig.json
$ROOT/cmd pnpm tsc --watch --project ./tsconfig.json

2
framework/cmd.d/list
View File

@@ -2,7 +2,7 @@
set -eu
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
cd "$DIR"

2
framework/cmd.d/node
View File

@@ -2,6 +2,6 @@
set -eu
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
"$DIR"/../shims/node "$@"

2
framework/cmd.d/pnpm
View File

@@ -2,6 +2,6 @@
set -eu
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
"$DIR"/../shims/pnpm "$@"

9
framework/cmd.d/sync
View File

@@ -2,7 +2,7 @@
set -eu
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# figure out the platform we're on
@@ -11,11 +11,8 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# download $nodejs_version
# verify its checksum against $nodejs_checksum
cd "$DIR/../node"
cd $DIR/../node
$DIR/pnpm install
"$DIR"/pnpm install
echo we will download other files here later

7
framework/shims/common
View File

@@ -1,4 +1,5 @@
common_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
ROOT="$common_DIR/../../"
# Fix for https://www.shellcheck.net/wiki/SC2148
# shellcheck shell=bash
common_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export ROOT="$common_DIR/../../"

11
framework/shims/node
View File

@@ -4,12 +4,13 @@
set -eu
export DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
node_shim_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export node_shim_DIR
source "$DIR/../versions"
source "$node_shim_DIR"/../versions
node_bin="$DIR/../../$nodejs_bin_dir/node"
source "$node_shim_DIR"/node.common
node_bin="$node_shim_DIR/../../$nodejs_binary_dir/node"
exec "$node_bin" "$@"

6
framework/shims/node.common
View File

@@ -1,4 +1,7 @@
node_common_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# Fix for https://www.shellcheck.net/wiki/SC2148
# shellcheck shell=bash
node_common_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
# FIXME this shouldn't be hardcoded here of course
nodejs_binary_dir="$node_common_DIR/../binaries/node-v22.15.1-linux-x64/bin"
@@ -6,7 +9,6 @@ nodejs_binary_dir="$node_common_DIR/../binaries/node-v22.15.1-linux-x64/bin"
# This might be too restrictive. Or not restrictive enough.
PATH="$nodejs_binary_dir":/bin:/usr/bin
project_root="$node_common_DIR/../.."
node_dir="$project_root/$nodejs_binary_dir"

14
framework/shims/npm
View File

@@ -2,14 +2,12 @@
set -eu
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
npm_shim_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export npm_shim_DIR
source "$DIR"/node.common
# shellcheck source=node.common
source "$npm_shim_DIR"/node.common
cd $DIR/../.nodejs-config
echo in dir $(pwd)
cd "$npm_shim_DIR"/../.nodejs-config
echo in dir "$(pwd)"
npm "$@"

14
framework/shims/pnpm
View File

@@ -2,11 +2,15 @@
set -eu
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
pnpm_shim_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
export pnpm_shim_DIR
source "$DIR"/node.common
source "$DIR"/common
# shellcheck source=./node.common
source "$pnpm_shim_DIR"/node.common
cd $ROOT/framework/node
# shellcheck source=./common
source "$pnpm_shim_DIR"/common
exec "$DIR"/../binaries/pnpm "$@"
# cd $ROOT/framework/node
exec "$pnpm_shim_DIR"/../binaries/pnpm "$@"