Update cleanup marker logic for Fedora users. (#5868)
Signed-off-by: Carlos <me@sudocarlos.com>
This commit is contained in:
@@ -24,31 +24,31 @@ trap 'log "An error occurred. Exiting with status $?."' ERR
|
|||||||
log "Starting node setup (common)."
|
log "Starting node setup (common)."
|
||||||
|
|
||||||
# One-time cleanup for existing Linux users to fix locking issues
|
# One-time cleanup for existing Linux users to fix locking issues
|
||||||
CLEANUP_MARKER="~/.config/goose/.mcp-hermit-cleanup-v1"
|
CLEANUP_MARKER=${HOME}/.config/goose/.mcp-hermit-cleanup-v1
|
||||||
if [[ "$(uname -s)" == "Linux" ]] && [ ! -f "$CLEANUP_MARKER" ]; then
|
if [[ "$(uname -s)" == "Linux" ]] && [ ! -f "$CLEANUP_MARKER" ]; then
|
||||||
log "Performing one-time cleanup of old mcp-hermit directory to fix locking issues."
|
log "Performing one-time cleanup of old mcp-hermit directory to fix locking issues."
|
||||||
if [ -d ~/.config/goose/mcp-hermit ]; then
|
if [ -d ${HOME}/.config/goose/mcp-hermit ]; then
|
||||||
rm -rf ~/.config/goose/mcp-hermit
|
rm -rf ${HOME}/.config/goose/mcp-hermit
|
||||||
log "Removed old mcp-hermit directory."
|
log "Removed old mcp-hermit directory."
|
||||||
fi
|
fi
|
||||||
touch "$CLEANUP_MARKER"
|
touch "$CLEANUP_MARKER"
|
||||||
log "Cleanup completed. Marker file created."
|
log "Cleanup completed. Marker file created."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Ensure ~/.config/goose/mcp-hermit/bin exists
|
# Ensure ${HOME}/.config/goose/mcp-hermit/bin exists
|
||||||
log "Creating directory ~/.config/goose/mcp-hermit/bin if it does not exist."
|
log "Creating directory ${HOME}/.config/goose/mcp-hermit/bin if it does not exist."
|
||||||
mkdir -p ~/.config/goose/mcp-hermit/bin
|
mkdir -p ${HOME}/.config/goose/mcp-hermit/bin
|
||||||
|
|
||||||
# Change to the ~/.config/goose/mcp-hermit directory
|
# Change to the ${HOME}/.config/goose/mcp-hermit directory
|
||||||
log "Changing to directory ~/.config/goose/mcp-hermit."
|
log "Changing to directory ${HOME}/.config/goose/mcp-hermit."
|
||||||
cd ~/.config/goose/mcp-hermit
|
cd ${HOME}/.config/goose/mcp-hermit
|
||||||
|
|
||||||
|
|
||||||
# Check if hermit binary exists and download if not
|
# Check if hermit binary exists and download if not
|
||||||
if [ ! -f ~/.config/goose/mcp-hermit/bin/hermit ]; then
|
if [ ! -f ${HOME}/.config/goose/mcp-hermit/bin/hermit ]; then
|
||||||
log "Hermit binary not found. Downloading hermit binary."
|
log "Hermit binary not found. Downloading hermit binary."
|
||||||
curl -fsSL "https://github.com/cashapp/hermit/releases/download/stable/hermit-$(uname -s | tr '[:upper:]' '[:lower:]')-$(uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/').gz" \
|
curl -fsSL "https://github.com/cashapp/hermit/releases/download/stable/hermit-$(uname -s | tr '[:upper:]' '[:lower:]')-$(uname -m | sed 's/x86_64/amd64/' | sed 's/aarch64/arm64/').gz" \
|
||||||
| gzip -dc > ~/.config/goose/mcp-hermit/bin/hermit && chmod +x ~/.config/goose/mcp-hermit/bin/hermit
|
| gzip -dc > ${HOME}/.config/goose/mcp-hermit/bin/hermit && chmod +x ${HOME}/.config/goose/mcp-hermit/bin/hermit
|
||||||
log "Hermit binary downloaded and made executable."
|
log "Hermit binary downloaded and made executable."
|
||||||
else
|
else
|
||||||
log "Hermit binary already exists. Skipping download."
|
log "Hermit binary already exists. Skipping download."
|
||||||
@@ -56,13 +56,13 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
log "setting hermit cache to be local for MCP servers"
|
log "setting hermit cache to be local for MCP servers"
|
||||||
mkdir -p ~/.config/goose/mcp-hermit/cache
|
mkdir -p ${HOME}/.config/goose/mcp-hermit/cache
|
||||||
export HERMIT_STATE_DIR=~/.config/goose/mcp-hermit/cache
|
export HERMIT_STATE_DIR=${HOME}/.config/goose/mcp-hermit/cache
|
||||||
|
|
||||||
|
|
||||||
# Update PATH
|
# Update PATH
|
||||||
export PATH=~/.config/goose/mcp-hermit/bin:$PATH
|
export PATH=${HOME}/.config/goose/mcp-hermit/bin:$PATH
|
||||||
log "Updated PATH to include ~/.config/goose/mcp-hermit/bin."
|
log "Updated PATH to include ${HOME}/.config/goose/mcp-hermit/bin."
|
||||||
|
|
||||||
|
|
||||||
# Verify hermit installation
|
# Verify hermit installation
|
||||||
@@ -78,7 +78,7 @@ if [ ! -f bin/activate-hermit ]; then
|
|||||||
log "Creating temp dir with bin subdirectory for hermit copy to avoid self-update locks."
|
log "Creating temp dir with bin subdirectory for hermit copy to avoid self-update locks."
|
||||||
HERMIT_TMP_DIR="/tmp/hermit_tmp_$$/bin"
|
HERMIT_TMP_DIR="/tmp/hermit_tmp_$$/bin"
|
||||||
mkdir -p "$HERMIT_TMP_DIR"
|
mkdir -p "$HERMIT_TMP_DIR"
|
||||||
cp ~/.config/goose/mcp-hermit/bin/hermit "$HERMIT_TMP_DIR/hermit"
|
cp ${HOME}/.config/goose/mcp-hermit/bin/hermit "$HERMIT_TMP_DIR/hermit"
|
||||||
chmod +x "$HERMIT_TMP_DIR/hermit"
|
chmod +x "$HERMIT_TMP_DIR/hermit"
|
||||||
export PATH="$HERMIT_TMP_DIR:$PATH"
|
export PATH="$HERMIT_TMP_DIR:$PATH"
|
||||||
HERMIT_CLEANUP_DIR="/tmp/hermit_tmp_$$"
|
HERMIT_CLEANUP_DIR="/tmp/hermit_tmp_$$"
|
||||||
@@ -124,10 +124,10 @@ if [ -n "${GOOSE_NPM_REGISTRY:-}" ] && curl -s --head --fail "$GOOSE_NPM_REGISTR
|
|||||||
# Check if GOOSE_NPM_CERT is set and accessible
|
# Check if GOOSE_NPM_CERT is set and accessible
|
||||||
if [ -n "${GOOSE_NPM_CERT:-}" ] && curl -s --head --fail "$GOOSE_NPM_CERT" > /dev/null; then
|
if [ -n "${GOOSE_NPM_CERT:-}" ] && curl -s --head --fail "$GOOSE_NPM_CERT" > /dev/null; then
|
||||||
log "Downloading certificate from: $GOOSE_NPM_CERT"
|
log "Downloading certificate from: $GOOSE_NPM_CERT"
|
||||||
curl -sSL -o ~/.config/goose/mcp-hermit/cert.pem "$GOOSE_NPM_CERT"
|
curl -sSL -o ${HOME}/.config/goose/mcp-hermit/cert.pem "$GOOSE_NPM_CERT"
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
log "Certificate downloaded successfully."
|
log "Certificate downloaded successfully."
|
||||||
export NODE_EXTRA_CA_CERTS=~/.config/goose/mcp-hermit/cert.pem
|
export NODE_EXTRA_CA_CERTS=${HOME}/.config/goose/mcp-hermit/cert.pem
|
||||||
else
|
else
|
||||||
log "Unable to download the certificate. Skipping certificate setup."
|
log "Unable to download the certificate. Skipping certificate setup."
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user