mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-04-30 22:25:06 +02:00
Code Issues Actions10 Packages Projects Releases Wiki Activity

Add missing lld dependency and fix syntax typo ()

Browse source 
* Add missing lld dependency and fix syntax typo in devcontainer_postcreate.sh
* replace pushd/popd with shell agnostic solution and do not throw away std out/err
---------
Co-authored-by: foobar <foobar>
This commit is contained in:
Foosec 2025-03-21 02:51:58 +01:00 committed by GitHub
parent ef638a62e9
commit 11c7266ff3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions

5
scripts/devcontainer_postcreate.sh
View file

@ -21,7 +21,8 @@ sudo apt-get install -y \
libsystemd-dev \ libsystemd-dev \
libudev-dev \ libudev-dev \
pkg-config \ pkg-config \
ripgrep ripgrep \
lld
export PATH="$HOME/.cargo/bin:$PATH" export PATH="$HOME/.cargo/bin:$PATH"
@ -36,7 +37,7 @@ sudo chgrp vscode ~/ -R
# shellcheck disable=SC1091 # shellcheck disable=SC1091
source scripts/devcontainer_poststart.sh source scripts/devcontainer_poststart.sh
cargo install cargo install \
cargo-audit \ cargo-audit \
mdbook-mermaid \ mdbook-mermaid \
mdbook mdbook

6
server/daemon/run_insecure_dev_server.sh
View file

@ -29,7 +29,9 @@ if [ ! -f "${CONFIG_FILE}" ]; then
exit 1 exit 1
fi fi
pushd "${SCRIPT_DIR}" > /dev/null 2>&1 # Save current directory and change to script directory without pushd
OLD_DIR=$(pwd)
cd "${SCRIPT_DIR}" || exit 1
if [ -n "${1}" ]; then if [ -n "${1}" ]; then
COMMAND=$* COMMAND=$*
#shellcheck disable=SC2086 #shellcheck disable=SC2086
@ -40,4 +42,4 @@ else
#shellcheck disable=SC2086 #shellcheck disable=SC2086
cargo run ${KANI_CARGO_OPTS} --bin kanidmd -- server -c "${CONFIG_FILE}" cargo run ${KANI_CARGO_OPTS} --bin kanidmd -- server -c "${CONFIG_FILE}"
fi fi
popd > /dev/null 2>&1 cd "${OLD_DIR}" || exit 1