diff --git a/.husky/pre-commit b/.husky/pre-commit index 06f435e10..714a8ce30 100644 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -13,7 +13,7 @@ get_changed_files() while read -d $'\0' file do echo ${file} - done < <(git diff --staged -z --name-only -- $@) + done < <(git diff --staged -z --name-only -- "$@") } readarray -t changed_css < <(get_changed_files 'css/*.css') diff --git a/RELEASING.md b/RELEASING.md index 64a899883..393e90f4e 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -10,6 +10,7 @@ First, make sure the `changelog.md` displays the correct new version (`## X.Y.Z This will trigger the release action which creates a draft for the release notes. If something goes wrong: + 1. Delete tag locally: `git tag --delete stable/v3.0.0` 2. Delete tag on remote: `git push --delete origin stable/v3.0.0` diff --git a/changelog.md b/changelog.md index fd3a8c57d..578fd6458 100644 --- a/changelog.md +++ b/changelog.md @@ -2,7 +2,6 @@ - Who built 3.0.1: diff --git a/js/classes/FlexibleDayCalendar.js b/js/classes/FlexibleDayCalendar.js index f2be28aa6..e575f32fb 100644 --- a/js/classes/FlexibleDayCalendar.js +++ b/js/classes/FlexibleDayCalendar.js @@ -20,16 +20,16 @@ const { BrowserWindow, dialog } = remote; * @param {Object.} options * @param {function} successCallback */ - function showDialog(options, successCallback) - { - options['title'] = options['title'] || 'Time to Leave'; - dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options) - .then(successCallback) - .catch(err => - { - console.log(err); - }); - } +function showDialog(options, successCallback) +{ + options['title'] = options['title'] || 'Time to Leave'; + dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options) + .then(successCallback) + .catch(err => + { + console.log(err); + }); +} //// class FlexibleDayCalendar extends BaseCalendar diff --git a/js/classes/FlexibleMonthCalendar.js b/js/classes/FlexibleMonthCalendar.js index 8bf71c71a..b9ebd01b0 100644 --- a/js/classes/FlexibleMonthCalendar.js +++ b/js/classes/FlexibleMonthCalendar.js @@ -25,16 +25,16 @@ const { BrowserWindow, dialog } = remote; * @param {Object.} options * @param {function} successCallback */ - function showDialog(options, successCallback) - { - options['title'] = options['title'] || 'Time to Leave'; - dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options) - .then(successCallback) - .catch(err => - { - console.log(err); - }); - } +function showDialog(options, successCallback) +{ + options['title'] = options['title'] || 'Time to Leave'; + dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options) + .then(successCallback) + .catch(err => + { + console.log(err); + }); +} //// class FlexibleMonthCalendar extends BaseCalendar diff --git a/js/window-aux.js b/js/window-aux.js index 6cfb33f0a..c7da77cb8 100644 --- a/js/window-aux.js +++ b/js/window-aux.js @@ -12,7 +12,7 @@ const dialog = (electron || electron.remote).dialog; function showDialogSync(options) { options['title'] = options['title'] || 'Time to Leave'; - return dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options) + return dialog.showMessageBox(BrowserWindow.getFocusedWindow(), options); } /** diff --git a/scripts/create_windows_installer.js b/scripts/create_windows_installer.js index c7a4b2a2b..39ac208aa 100644 --- a/scripts/create_windows_installer.js +++ b/scripts/create_windows_installer.js @@ -1,23 +1,25 @@ -const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller +const createWindowsInstaller = require('electron-winstaller').createWindowsInstaller; getInstallerConfig() - .then(createWindowsInstaller) - .catch((error) => { - console.error(error.message || error) - process.exit(1) - }) + .then(createWindowsInstaller) + .catch((error) => + { + console.error(error.message || error); + process.exit(1); + }); -function getInstallerConfig () { - console.log('creating windows installer') +function getInstallerConfig() +{ + console.log('creating windows installer'); - return Promise.resolve({ - appDirectory: 'release-builds/Time to Leave-win32-ia32', - outputDirectory: 'packages', - exe: 'Time To Leave.exe', - setupIcon: 'assets/icon-win.ico', - setupExe: 'TimeToLeaveInstaller.exe', - noMsi: true, - loadingGif: 'assets/installer.gif', - iconUrl: 'https://raw.githubusercontent.com/thamara/time-to-leave/main/assets/icon-win.ico', - }) + return Promise.resolve({ + appDirectory: 'release-builds/Time to Leave-win32-ia32', + outputDirectory: 'packages', + exe: 'Time To Leave.exe', + setupIcon: 'assets/icon-win.ico', + setupExe: 'TimeToLeaveInstaller.exe', + noMsi: true, + loadingGif: 'assets/installer.gif', + iconUrl: 'https://raw.githubusercontent.com/thamara/time-to-leave/main/assets/icon-win.ico', + }); }