Skip to content

Commit 3af332d

Browse files
author
arch
committed
improve lua json include
1 parent f7a21a4 commit 3af332d

File tree

4 files changed

+4
-19
lines changed

4 files changed

+4
-19
lines changed

.github/workflows/prerelease_windows_application.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,15 +56,10 @@ jobs:
5656
run: |
5757
cp "contrib/Installer/assets/main.lua" "dist/funscript-editor/OFS/main.lua"
5858
59-
- name: Create json lua extensions dir
60-
shell: bash -l {0}
61-
run: |
62-
mkdir -p "dist/funscript-editor/OFS/json"
63-
6459
- name: Add json Lua Extension
6560
shell: bash -l {0}
6661
run: |
67-
cp "contrib/Installer/assets/json.lua" "dist/funscript-editor/OFS/json/lua.lua"
62+
cp "contrib/Installer/assets/json.lua" "dist/funscript-editor/OFS/json.lua"
6863
6964
- name: Create Asset Archive
7065
uses: vimtor/action-zip@v1

.github/workflows/release_windows_application.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,15 +61,10 @@ jobs:
6161
run: |
6262
cp "contrib/Installer/assets/main.lua" "dist/funscript-editor/OFS/main.lua"
6363
64-
- name: Create json lua extensions dir
65-
shell: bash -l {0}
66-
run: |
67-
mkdir -p "dist/funscript-editor/OFS/json"
68-
6964
- name: Add json Lua Extension
7065
shell: bash -l {0}
7166
run: |
72-
cp "contrib/Installer/assets/json.lua" "dist/funscript-editor/OFS/json/lua.lua"
67+
cp "contrib/Installer/assets/json.lua" "dist/funscript-editor/OFS/json.lua"
7368
7469
- name: Add Version to Build
7570
shell: bash -l {0}

contrib/Installer/assets/main.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
json = require "json.lua"
2-
-- MTFG LUA Wrappper Version 2.0.0
1+
json = require "json"
2+
-- MTFG LUA Wrappper Version 2.0.1
33

44
-- global var
55
processHandleMTFG = nil

contrib/OpenFunscripter/openfunscripter_setup_linux.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,6 @@ cp -fv "$OFS_EXTENSION_DIR/MTFG/Python-Funscript-Editor/contrib/Installer/assets
129129
cp -fv "$OFS_EXTENSION_DIR/MTFG/Python-Funscript-Editor/contrib/Installer/assets/json.lua" \
130130
"$OFS_EXTENSION_DIR/MTFG/json.lua"
131131

132-
mkdir -p "$OFS_EXTENSION_DIR/MTFG/json"
133-
134-
cp -fv "$OFS_EXTENSION_DIR/MTFG/Python-Funscript-Editor/contrib/Installer/assets/json.lua" \
135-
"$OFS_EXTENSION_DIR/MTFG/json/lua.lua"
136-
137132
popd
138133

139134
if [ ! -e ~/.local/bin/OpenFunscripter ]; then

0 commit comments

Comments
 (0)