diff --git a/.circleci/config.yml b/.circleci/config.yml index 41c1f182..a3625a1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -159,9 +159,9 @@ jobs: - run: name: Fix Versioning and Add Channel command: yarn circle:script - # - run: - # name: Set App Version - # command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV + - run: + name: Set App Version + command: echo "export APP_VERSION=$(grep '"version":.*' package.json | cut -d '"' -f 4 | head -1)" >> $BASH_ENV - run: name: Publish Release command: | diff --git a/resources/circle.js b/resources/circle.js index 4cbac3bf..199b32c6 100644 --- a/resources/circle.js +++ b/resources/circle.js @@ -34,13 +34,13 @@ pkg.publish = { const {exec} = require('child_process') -exec(`export APP_VERSION=${pkg.version} && echo $APP_VERSION`, {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { +exec(`echo $APP_VERSION`, {env: {'APP_VERSION': pkg.version}}, function (error, stdout, stderr) { console.log(stdout, stderr, error); }); writeFile('package.json', JSON.stringify(pkg), err => { // error checking if (err) throw err; - console.log(`VERSION CHANGED TO ${pkg.version}`); + console.log(`VERSION CHANGED TO ${pkg.version}`, pkg); }); diff --git a/src/renderer/main/vueapp.js b/src/renderer/main/vueapp.js index 9cace20c..d1004e91 100644 --- a/src/renderer/main/vueapp.js +++ b/src/renderer/main/vueapp.js @@ -818,7 +818,13 @@ const app = new Vue({ CiderAudio.audioNodes.gainNode.gain.value = gain } catch (e) { } } - } catch (e) { ipcRenderer.send('SoundCheckTag', event, tag); } // brute force until it works + } catch (e) { + try { ipcRenderer.send('SoundCheckTag', event, tag); } + catch (e) { + try {ipcRenderer.send('SoundCheckTag', event, tag);} + catch (e) {console.log("[Cider][MaikiwiSoundCheck] Error [Gave up after 3 consecutive attempts]: " + e)} + } + } // brute force until it works }) ipcRenderer.on('play', function (_event, mode, id) {