From 2a4391f4d53de766743e112830f80007643a5601 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Thu, 12 Feb 2026 01:58:47 +0800 Subject: [PATCH 1/4] fix: main to eask.js --- Easkfile | 22 ------- bin/eask | 4 +- bin/eask.bat | 2 +- eask | 143 ++++++---------------------------------------- eask.js | 131 ++++++++++++++++++++++++++++++++++++++++++ package-lock.json | 4 +- package.json | 4 +- 7 files changed, 155 insertions(+), 155 deletions(-) delete mode 100644 Easkfile create mode 100644 eask.js diff --git a/Easkfile b/Easkfile deleted file mode 100644 index e343d9a1..00000000 --- a/Easkfile +++ /dev/null @@ -1,22 +0,0 @@ -;; -*- mode: eask; lexical-binding: t -*- - -(package "cli" - "0.12.5" - "A set of command-line tools to build Emacs packages") - -(website-url "https://github.com/emacs-eask/cli") -(keywords "emacs" "package" "management" "cli") - -(script "test" "echo \"Error: no test specified\" && exit 1") -(script "install" "npm install") -(script "setup-doc" "cd ./docs/themes/geekdoc/ && npm install && npm run build") -(script "serve-doc" "cd ./docs/ && hugo server") - -(files - "eask" - "bin" - "cmds/**/*.js" - "lisp/**/*.el" - "src") - -(depends-on "emacs" "26.1") diff --git a/bin/eask b/bin/eask index 27ee6f72..09f8cd8a 100755 --- a/bin/eask +++ b/bin/eask @@ -23,11 +23,11 @@ function _get_current_directory() elif realpath -e -L "${0}" &>/dev/null then CDIR="$(realpath -e -L "${0}")" - CDIR="${CDIR%/eask}" + CDIR="${CDIR%/eask.js}" fi } CDIR="$(pwd)" _get_current_directory -node "$CDIR/../eask" "$@" +node "$CDIR/../eask.js" "$@" diff --git a/bin/eask.bat b/bin/eask.bat index c9aa2e1b..b2e0767e 100644 --- a/bin/eask.bat +++ b/bin/eask.bat @@ -15,4 +15,4 @@ :: You should have received a copy of the GNU General Public License :: along with this program. If not, see . -node "%~dp0/../eask" %* +node "%~dp0/../eask.js" %* diff --git a/eask b/eask index f5062ecc..e343d9a1 100755 --- a/eask +++ b/eask @@ -1,131 +1,22 @@ -#!/usr/bin/env node +;; -*- mode: eask; lexical-binding: t -*- -const env = require('./src/env'); -const yargs = require('yargs'); +(package "cli" + "0.12.5" + "A set of command-line tools to build Emacs packages") -const usage = `eask is the main command, used to manage your Emacs dependencies +(website-url "https://github.com/emacs-eask/cli") +(keywords "emacs" "package" "management" "cli") -Eask is a command-line tool that helps you build, lint, and test Emacs Lisp packages. +(script "test" "echo \"Error: no test specified\" && exit 1") +(script "install" "npm install") +(script "setup-doc" "cd ./docs/themes/geekdoc/ && npm install && npm run build") +(script "serve-doc" "cd ./docs/ && hugo server") -Usage: eask [options..]`; +(files + "eask" + "bin" + "cmds/**/*.js" + "lisp/**/*.el" + "src") -const epilogue = `For more information, find the manual at https://emacs-eask.github.io/`; - -const version = `0.12.5`; - -yargs - .usage(usage) - .scriptName('') - .epilogue(epilogue) - .commandDir('cmds/core/') - .commandDir('cmds/util/') - .command({ - command: '*', - handler() { yargs.showHelp(); } - }) - .version('version', 'output version information and exit', version) - .help('help', 'show usage instructions') - .showHidden('show-hidden', 'Show hidden commands and options') - .options({ - 'global': { - description: `change default workspace to ~/.eask/`, - alias: 'g', - type: 'boolean', - }, - 'config': { - description: `change default workspace to ~/.emacs.d/`, - alias: 'c', - type: 'boolean', - }, - 'all': { - description: `enable all flag`, - alias: 'a', - type: 'boolean', - }, - 'quick': { - description: `start cleanly without loading the configuration files`, - alias: 'q', - type: 'boolean', - }, - 'force': { - description: `enable force flag`, - alias: 'f', - type: 'boolean', - }, - 'debug': { - description: `turn on debug mode`, - type: 'boolean', - }, - 'strict': { - description: `report error instead of warnings`, - type: 'boolean', - }, - 'allow-error': { - description: `attempt to continue execution on error`, - type: 'boolean', - }, - 'insecure': { - description: `allow insecure connection`, - type: 'boolean', - }, - 'timestamps': { - description: `log with timestamps`, - type: 'boolean', - hidden: true, - }, - 'log-level': { - description: `log with level`, - type: 'boolean', - hidden: true, - }, - 'log-file': { - description: `generate log files`, - alias: 'lf', - type: 'boolean', - hidden: true, - }, - 'elapsed-time': { - description: `show elapsed time between each operation`, - alias: 'et', - type: 'boolean', - hidden: true, - }, - 'no-color': { - description: 'enable/disable color output', - type: 'boolean', - }, - 'verbose': { - description: `set verbosity from 0 to 5`, - alias: 'v', - requiresArg: true, - type: 'number', - }, - }) - .options({ - 'proxy': { - description: `update proxy for HTTP and HTTPS to host`, - type: 'string', - group: TITLE_PROXY_OPTION, - }, - 'http-proxy': { - description: `update proxy for HTTP to host`, - type: 'string', - group: TITLE_PROXY_OPTION, - }, - 'https-proxy': { - description: `update proxy for HTTPS to host`, - type: 'string', - group: TITLE_PROXY_OPTION, - }, - 'no-proxy': { - description: `set no-proxy to host`, - type: 'string', - group: TITLE_PROXY_OPTION, - }, - }) - .parserConfiguration({ "boolean-negation": false }) - .strict() - .demandCommand() - .showHelpOnFail(true) - .wrap(yargs.terminalWidth()) - .argv; +(depends-on "emacs" "26.1") diff --git a/eask.js b/eask.js new file mode 100644 index 00000000..f5062ecc --- /dev/null +++ b/eask.js @@ -0,0 +1,131 @@ +#!/usr/bin/env node + +const env = require('./src/env'); +const yargs = require('yargs'); + +const usage = `eask is the main command, used to manage your Emacs dependencies + +Eask is a command-line tool that helps you build, lint, and test Emacs Lisp packages. + +Usage: eask [options..]`; + +const epilogue = `For more information, find the manual at https://emacs-eask.github.io/`; + +const version = `0.12.5`; + +yargs + .usage(usage) + .scriptName('') + .epilogue(epilogue) + .commandDir('cmds/core/') + .commandDir('cmds/util/') + .command({ + command: '*', + handler() { yargs.showHelp(); } + }) + .version('version', 'output version information and exit', version) + .help('help', 'show usage instructions') + .showHidden('show-hidden', 'Show hidden commands and options') + .options({ + 'global': { + description: `change default workspace to ~/.eask/`, + alias: 'g', + type: 'boolean', + }, + 'config': { + description: `change default workspace to ~/.emacs.d/`, + alias: 'c', + type: 'boolean', + }, + 'all': { + description: `enable all flag`, + alias: 'a', + type: 'boolean', + }, + 'quick': { + description: `start cleanly without loading the configuration files`, + alias: 'q', + type: 'boolean', + }, + 'force': { + description: `enable force flag`, + alias: 'f', + type: 'boolean', + }, + 'debug': { + description: `turn on debug mode`, + type: 'boolean', + }, + 'strict': { + description: `report error instead of warnings`, + type: 'boolean', + }, + 'allow-error': { + description: `attempt to continue execution on error`, + type: 'boolean', + }, + 'insecure': { + description: `allow insecure connection`, + type: 'boolean', + }, + 'timestamps': { + description: `log with timestamps`, + type: 'boolean', + hidden: true, + }, + 'log-level': { + description: `log with level`, + type: 'boolean', + hidden: true, + }, + 'log-file': { + description: `generate log files`, + alias: 'lf', + type: 'boolean', + hidden: true, + }, + 'elapsed-time': { + description: `show elapsed time between each operation`, + alias: 'et', + type: 'boolean', + hidden: true, + }, + 'no-color': { + description: 'enable/disable color output', + type: 'boolean', + }, + 'verbose': { + description: `set verbosity from 0 to 5`, + alias: 'v', + requiresArg: true, + type: 'number', + }, + }) + .options({ + 'proxy': { + description: `update proxy for HTTP and HTTPS to host`, + type: 'string', + group: TITLE_PROXY_OPTION, + }, + 'http-proxy': { + description: `update proxy for HTTP to host`, + type: 'string', + group: TITLE_PROXY_OPTION, + }, + 'https-proxy': { + description: `update proxy for HTTPS to host`, + type: 'string', + group: TITLE_PROXY_OPTION, + }, + 'no-proxy': { + description: `set no-proxy to host`, + type: 'string', + group: TITLE_PROXY_OPTION, + }, + }) + .parserConfiguration({ "boolean-negation": false }) + .strict() + .demandCommand() + .showHelpOnFail(true) + .wrap(yargs.terminalWidth()) + .argv; diff --git a/package-lock.json b/package-lock.json index dae49a65..46e71c84 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,13 +7,13 @@ "": { "name": "@emacs-eask/cli", "version": "0.12.5", - "license": "GPL-3.0", + "license": "GPL-3.0-or-later", "dependencies": { "which": "^6.0.0", "yargs": "^17.0.0" }, "bin": { - "eask": "eask" + "eask": "eask.js" }, "devDependencies": { "@yao-pkg/pkg": "^6.0.0", diff --git a/package.json b/package.json index 4622b18e..18672ddb 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@emacs-eask/cli", "version": "0.12.5", "description": "A set of command-line tools to build Emacs packages", - "main": "eask", + "main": "eask.js", "scripts": { "test-unsafe": "cross-env ALLOW_UNSAFE=1 jest", "test-debug": "cross-env DEBUG=1 jest", @@ -17,7 +17,7 @@ "pkg-win-x64": "pkg package.json -t node*-win-x64 --output dist/eask --public" }, "bin": { - "eask": "./eask" + "eask": "./eask.js" }, "repository": { "type": "git", From 68170550e197a675b139e49d38d5f54cc13da69f Mon Sep 17 00:00:00 2001 From: JenChieh Date: Thu, 12 Feb 2026 02:01:23 +0800 Subject: [PATCH 2/4] clean eask cache --- eask | 22 ---------------------- 1 file changed, 22 deletions(-) delete mode 100755 eask diff --git a/eask b/eask deleted file mode 100755 index e343d9a1..00000000 --- a/eask +++ /dev/null @@ -1,22 +0,0 @@ -;; -*- mode: eask; lexical-binding: t -*- - -(package "cli" - "0.12.5" - "A set of command-line tools to build Emacs packages") - -(website-url "https://github.com/emacs-eask/cli") -(keywords "emacs" "package" "management" "cli") - -(script "test" "echo \"Error: no test specified\" && exit 1") -(script "install" "npm install") -(script "setup-doc" "cd ./docs/themes/geekdoc/ && npm install && npm run build") -(script "serve-doc" "cd ./docs/ && hugo server") - -(files - "eask" - "bin" - "cmds/**/*.js" - "lisp/**/*.el" - "src") - -(depends-on "emacs" "26.1") From c7d5fdb15958ce053cc05a91b2ebfd9604b0a97a Mon Sep 17 00:00:00 2001 From: JenChieh Date: Thu, 12 Feb 2026 02:01:34 +0800 Subject: [PATCH 3/4] chore: Add back Eask file --- Eask | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Eask diff --git a/Eask b/Eask new file mode 100644 index 00000000..e343d9a1 --- /dev/null +++ b/Eask @@ -0,0 +1,22 @@ +;; -*- mode: eask; lexical-binding: t -*- + +(package "cli" + "0.12.5" + "A set of command-line tools to build Emacs packages") + +(website-url "https://github.com/emacs-eask/cli") +(keywords "emacs" "package" "management" "cli") + +(script "test" "echo \"Error: no test specified\" && exit 1") +(script "install" "npm install") +(script "setup-doc" "cd ./docs/themes/geekdoc/ && npm install && npm run build") +(script "serve-doc" "cd ./docs/ && hugo server") + +(files + "eask" + "bin" + "cmds/**/*.js" + "lisp/**/*.el" + "src") + +(depends-on "emacs" "26.1") From 9cbb895984d5cbd1c27023b885245a9fe1dfb426 Mon Sep 17 00:00:00 2001 From: JenChieh Date: Thu, 12 Feb 2026 02:07:54 +0800 Subject: [PATCH 4/4] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9226844..90625d25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how * fix(lisp): Set up paths regardless of the working environment ([#386](../../pull/386)) * feat(cmds): Move `el2org` to docs subcommand ([#388](../../pull/388)) * fix(lisp): Report error only inside the command's execution ([#389](../../pull/389)) +* fix: Correct entry file name to `eask.js` instead of `eask` ([#397](../../pull/397)) ## 0.12.x > Released Dec 02, 2025