@@ -2,19 +2,19 @@ import * as core from '@actions/core';
22import * as exec from "@actions/exec" ;
33import * as io from "@actions/io" ;
44import * as tc from "@actions/tool-cache" ;
5+ import fs from 'fs'
56
67async function run ( ) : Promise < void > {
78 try {
89 const PATH = process . env . PATH ;
910
1011 const version = core . getInput ( "version" ) ;
11- const ver_lst = version . split ( "." ) ;
12- const emacs_major_ver = ver_lst [ 0 ] ;
13- const emacs_minor_ver = ver_lst [ 1 ] ;
14- const dot_ver = emacs_major_ver + "." + emacs_minor_ver ;
15- const dash_ver = emacs_major_ver + "-" + emacs_minor_ver ;
16- const emacs_dot_var = "emacs-" + dot_ver ;
17- const emacs_dash_ver = "emacs-" + dash_ver ;
12+ const ver_lst = version . split ( "." ) ; // if 27.1
13+ const emacs_major_ver = ver_lst [ 0 ] ; // 27
14+ const emacs_minor_ver = ver_lst [ 1 ] ; // 1
15+ const dot_ver = emacs_major_ver + "." + emacs_minor_ver ; // 27.1
16+ const dash_ver = emacs_major_ver + "-" + emacs_minor_ver ; // 27-1
17+ const emacs_dot_var = "emacs-" + dot_ver ; // emacs-27.1
1818
1919 core . startGroup ( "Installing Emacs" ) ;
2020 const ftpUrl = "https://ftp.gnu.org/gnu/emacs/windows/emacs-" + emacs_major_ver + "/" ;
@@ -60,7 +60,12 @@ async function run(): Promise<void> {
6060
6161 await exec . exec ( "dir dist" ) ;
6262
63- const emacsBin = emacsDir + "\\bin" ;
63+ let emacsBin = emacsDir + "\\bin" ;
64+
65+ if ( fs . existsSync ( emacsBin ) ) {
66+ emacsBin = emacsDir + "\\" + emacs_dot_var + "\\bin" ;
67+ }
68+
6469 console . log ( "emacsBin: " + emacsBin ) ;
6570 const cachtedPath = await tc . cacheDir ( emacsBin , "emacs" , dot_ver ) ;
6671 core . addPath ( cachtedPath ) ;
0 commit comments