From 8e7498017f7d423cf45dc58dc9d254904ccd08d0 Mon Sep 17 00:00:00 2001 From: Hysterelius Date: Sat, 3 Aug 2024 12:23:11 +1000 Subject: Fix bug in sync (#189) * Fix bug in sync--- package_abridge.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'package_abridge.js') diff --git a/package_abridge.js b/package_abridge.js index 70cb40c..e99d0c5 100644 --- a/package_abridge.js +++ b/package_abridge.js @@ -368,6 +368,11 @@ async function sync() { })).sort((a, b) => a.name.localeCompare(b.name)); }; + if (packageJsonContent !== submodulePackageJsonContent) { + console.log("Updating package.json from submodule"); + fs.copyFileSync(submodulePackageJson, packageJson); + } + const packageVersionLocal = checkPackageVersion(packageJsonContent); const packageVersionSubmodule = checkPackageVersion(submodulePackageJsonContent); if (JSON.stringify(packageVersionLocal) !== JSON.stringify(packageVersionSubmodule)) { @@ -379,11 +384,7 @@ async function sync() { exit(1); } console.log(packageVersionLocal, packageVersionSubmodule); - - if (packageJsonContent !== submodulePackageJsonContent) { - console.log("Updating package.json from submodule"); - fs.copyFileSync(submodulePackageJson, packageJson); - } + const configToml = path.join(__dirname, "config.toml"); const submoduleConfigToml = path.join( __dirname, -- cgit v1.3.1