From 3aebeb8c8ccbeba89d301beff08e6052f412d08d Mon Sep 17 00:00:00 2001 From: "CanbiZ (MickLesk)" <47820557+MickLesk@users.noreply.github.com> Date: Fri, 17 Apr 2026 07:44:01 +0200 Subject: [PATCH] minor fixes --- install/clickhouse-install.sh | 5 +++-- install/invoiceshelf-install.sh | 2 +- install/papermark-install.sh | 4 +++- install/slink-install.sh | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/install/clickhouse-install.sh b/install/clickhouse-install.sh index bd92cafe..73372565 100644 --- a/install/clickhouse-install.sh +++ b/install/clickhouse-install.sh @@ -203,9 +203,10 @@ EOF msg_ok "Cloned HyperDX v${HDX_VERSION}" msg_info "Enabling Corepack" - $STD corepack enable - $STD corepack prepare yarn@stable --activate cd /opt/clickstack + $STD corepack enable + YARN_SPEC=$(node -e "const p=require('./package.json');process.stdout.write(p.packageManager||'yarn@stable')" 2>/dev/null || echo "yarn@stable") + $STD corepack prepare "${YARN_SPEC}" --activate msg_ok "Enabled Corepack" msg_info "Building HyperDX" diff --git a/install/invoiceshelf-install.sh b/install/invoiceshelf-install.sh index 1de218fb..8c9969b9 100644 --- a/install/invoiceshelf-install.sh +++ b/install/invoiceshelf-install.sh @@ -37,7 +37,7 @@ sed -i "s|^DB_PORT=.*|DB_PORT=5432|" .env sed -i "s|^DB_DATABASE=.*|DB_DATABASE=${PG_DB_NAME}|" .env sed -i "s|^DB_USERNAME=.*|DB_USERNAME=${PG_DB_USER}|" .env sed -i "s|^DB_PASSWORD=.*|DB_PASSWORD=${PG_DB_PASS}|" .env -$STD composer install --no-dev --optimize-autoloader +COMPOSER_ALLOW_SUPERUSER=1 $STD composer install --no-dev --optimize-autoloader --no-interaction $STD php artisan key:generate $STD yarn install $STD yarn build diff --git a/install/papermark-install.sh b/install/papermark-install.sh index 5505dd8a..05654be6 100644 --- a/install/papermark-install.sh +++ b/install/papermark-install.sh @@ -34,7 +34,9 @@ EOF $STD npm install $STD npx prisma generate $STD npx prisma migrate deploy -node -e "['next.config.js','next.config.mjs','next.config.ts'].forEach(n=>{try{const fp='/opt/papermark/'+n,fs=require('fs');let c=fs.readFileSync(fp,'utf8');c=c.replace(/\{(\s*)type(\s*):(\s*)['\"]host['\"](\s*)\}/g,'{type:\"host\",value:\".*\"}');fs.writeFileSync(fp,c)}catch(e){}})" 2>/dev/null || true +for f in next.config.js next.config.mjs next.config.ts; do + [[ -f "/opt/papermark/$f" ]] && sed -i 's/{"type":"host"}/{"type":"host","value":".*"}/g' "/opt/papermark/$f" +done $STD npm run build msg_ok "Set up Papermark" diff --git a/install/slink-install.sh b/install/slink-install.sh index 9088c267..504f91ec 100644 --- a/install/slink-install.sh +++ b/install/slink-install.sh @@ -60,8 +60,8 @@ $STD composer install --no-dev --optimize-autoloader --no-interaction mkdir -p /opt/slink/{data,images} sed -i "s|'/services/api/|'/opt/slink/services/api/|" config/migrations/event_store.yaml php bin/console lexik:jwt:generate-keypair --skip-if-exists >/dev/null 2>&1 || true -$STD php bin/console doctrine:database:create --connection=event_store --if-not-exists --no-interaction -$STD php bin/console doctrine:database:create --connection=read_model --if-not-exists --no-interaction +$STD php bin/console doctrine:database:create --connection=event_store --no-interaction +$STD php bin/console doctrine:database:create --connection=read_model --no-interaction $STD php bin/console doctrine:migrations:migrate --no-interaction --em=read_model $STD php bin/console doctrine:migrations:migrate --no-interaction --configuration=config/migrations/event_store.yaml --em=event_store $STD php bin/console messenger:setup-transports --no-interaction