From f1192726df1412edf80b640cf97f5c0c8ce9d310 Mon Sep 17 00:00:00 2001 From: Gerard Date: Thu, 7 Dec 2023 13:47:08 +0100 Subject: [PATCH] Fix relative install path --- CHANGELOG.md | 3 ++- package-lock.json | 4 ++-- package.json | 2 +- src/copyConfig.ts | 8 ++++---- src/index.ts | 2 +- 5 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c47fba0..325020a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ -# Version 1.6.0 +# Version 1.6.1 - Fixed error thrown when installing config folder without --force + - Fixed installing of config folder ## Version 1.5.0 ⚠️ diff --git a/package-lock.json b/package-lock.json index 3006630..92cb8ba 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "directus-extension-schema-sync", - "version": "1.6.0", + "version": "1.6.1", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "directus-extension-schema-sync", - "version": "1.6.0", + "version": "1.6.1", "devDependencies": { "@directus/extensions-sdk": "10.1.11", "@directus/types": "^10.1.6", diff --git a/package.json b/package.json index f1793b0..715d0f6 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "directus-extension-schema-sync", "description": "Sync schema and data betwreen Directus instances", "icon": "sync_alt", - "version": "1.6.0", + "version": "1.6.1", "repository": { "type": "git", "url": "https://github.com/bcc-code/directus-schema-sync.git" diff --git a/src/copyConfig.ts b/src/copyConfig.ts index 14c3bb7..40596a9 100644 --- a/src/copyConfig.ts +++ b/src/copyConfig.ts @@ -2,18 +2,18 @@ import fs from 'fs/promises'; import path from 'path'; import { fileURLToPath } from 'url'; -export async function copyConfig(force: boolean) { +export async function copyConfig(force: boolean, { logger }: { logger: any }) { const __dirname = path.dirname(fileURLToPath(import.meta.url)); - const srcDir = path.resolve(__dirname, 'install'); + const srcDir = path.resolve(__dirname, '../install'); const targetDir = process.cwd(); // Test if it doesn't already exist then if it does exit if (!force) { await fs.access(path.resolve(targetDir, 'schema-sync')).then(() => { - console.log('Config folder already exists, use --force to override'); + logger.info('Config folder already exists, use --force to override'); process.exit(0); }).catch(() => { - console.log('Creating config folder...'); + logger.info('Creating config folder...'); }); } diff --git a/src/index.ts b/src/index.ts index f98b4a0..91e925e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -139,7 +139,7 @@ const registerHook: HookConfig = async ({ action, init }, { env, services, datab .action(async ({ force }: { force: boolean }) => { logger.info('Installing Schema sync...'); await updateManager.ensureInstalled(); - await copyConfig(force); + await copyConfig(force, { logger }); logger.info('Done!'); process.exit(0);