Skip to content

Commit b7e1807

Browse files
(generator) Fix
1 parent 84e7e05 commit b7e1807

File tree

3 files changed

+8
-4
lines changed

3 files changed

+8
-4
lines changed

action.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ inputs:
3030
path:
3131
description: 'Website directory (compress/generate)'
3232
required: false
33+
fix-path:
34+
description: 'Fix file path (generate)'
35+
required: false
3336
runs:
3437
using: 'composite'
3538
steps:
@@ -38,3 +41,4 @@ runs:
3841
shell: bash
3942
env:
4043
INPUT_PATH: ${{ inputs.path }}
44+
INPUT_FIXPATH: ${{ inputs.fix-path }}

src/documentation/index.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ SOFTWARE.
2525
*/
2626

2727
const _just = {};
28-
const [HTMLtemplate, CSStemplate, JStemplate, PATH, repo, owner, customCSS, hljslangs, langs__, CSSHIGHLIGHTtemplate, langstext_, vrsn, CSSBUTTONStemplate, CSSSEARCHtemplate, HIGHLIGHTJSON] = process.argv.slice(2);
28+
const [HTMLtemplate, CSStemplate, JStemplate, PATH, repo, owner, customCSS, hljslangs, langs__, CSSHIGHLIGHTtemplate, langstext_, vrsn, CSSBUTTONStemplate, CSSSEARCHtemplate, HIGHLIGHTJSON, fixpathh] = process.argv.slice(2);
2929
let HTML = HTMLtemplate;
3030
let CSS = CSStemplate;
3131
let JS = JStemplate;
@@ -1084,7 +1084,7 @@ checkTLD(domain).then(tldvalid => {
10841084
const fixpath = HTMLUsePathInput && docsUsePathInput ? `${PATH}/`.repeat(2) : HTMLUsePathInput ? PATH+'/' : '';
10851085
let outHTML = HTML
10861086
.replace('<html>', `<html${htmlLang}>`)
1087-
.replaceAll('="/_just/', `="${start}${fixpath}_just/`)
1087+
.replaceAll('="/_just/', fixpathh ? `/${fixpathh}/_just/` : `="${start}${fixpath}_just/`)
10881088
.replace("content: '_just';", `content: '_just ${_just.version}';`)
10891089
.replace('REPLACE_SCRIPT', `const ${dataname2[11]}=${JSON.stringify(pages[1])};${pagejs ? `document.addEventListener('DOMContentLoaded',()=>{${pagejs}});` : ''}`)
10901090
.replaceAll('REPLACE_CSS', filename.css)
@@ -1219,7 +1219,7 @@ checkTLD(domain).then(tldvalid => {
12191219
JS.replace('\'REPLACE_PUBLICOUTPUT\'', hideOutput?false:publicOutput)
12201220
.replace('\'REPLACE_SEARCHV2\'', CSSdata[1] || false)
12211221
.replace('\'REPLACE_OUTPUT\'', hideOutput?false:watermark)
1222-
.replace('let searchurl = "/_just/search";', `let searchurl="${JSUsePathInput && docsUsePathInput ? `/${PATH}`.repeat(2) : JSUsePathInput ? '/'+PATH : ''}/_just/${dataname[9]}.json";`),
1222+
.replace('let searchurl = "/_just/search";', `let searchurl="${fixpathh ? '/'+fixpathh : JSUsePathInput && docsUsePathInput ? `/${PATH}`.repeat(2) : JSUsePathInput ? '/'+PATH : ''}/_just/${dataname[9]}.json";`),
12231223
JSdata.names.filter(n => n !== jstrimmedstrvar),
12241224
dataname2.reverse().slice(0, JSdata.total-1),
12251225
jstrimmedstrvarbasestr

src/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ elif [ "$TYPE" == "docs" ]; then
226226
HLJSLANGS=$(cat "$GITHUB_ACTION_PATH/data/hljslangs.json") && \
227227
LANGS=$(cat "$GITHUB_ACTION_PATH/data/langs.json") && \
228228
LANGSTEXT=$(cat "$GITHUB_ACTION_PATH/data/langstext.json") && \
229-
node "$INDEXJS0" "$HTML" "$CSS" "$JS" "$INPUT_PATH" "$GITHUB_REPOSITORY" "$GITHUB_REPOSITORY_OWNER" "$CUSTOMCSS" "$HLJSLANGS" "$LANGS" "$HIGHLIGHTCSS" "$LANGSTEXT" "$VERSION" "$BUTTONSCSS" "$SEARCHCSS" "$HIGHLIGHTJSON" || jserr && \
229+
node "$INDEXJS0" "$HTML" "$CSS" "$JS" "$INPUT_PATH" "$GITHUB_REPOSITORY" "$GITHUB_REPOSITORY_OWNER" "$CUSTOMCSS" "$HLJSLANGS" "$LANGS" "$HIGHLIGHTCSS" "$LANGSTEXT" "$VERSION" "$BUTTONSCSS" "$SEARCHCSS" "$HIGHLIGHTJSON" "$INPUT_FIXPATH" || jserr && \
230230
node $GITHUB_ACTION_PATH/src/compress.js "$INPUT_PATH" && \
231231
node "$GITHUB_ACTION_PATH/src/documentation/logs.js" "$INPUT_PATH" && \
232232
TIME3=$(python3 "$GITHUB_ACTION_PATH/src/time.py") && \

0 commit comments

Comments
 (0)