Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
energye
energy
提交
c1db1a6f
energy
项目概览
energye
/
energy
通知
13
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
energy
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c1db1a6f
编写于
9月 17, 2023
作者:
yanghye
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
command-line tools: linux arm add, run.sh, startup.sh
上级
2fba3d3b
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
55 addition
and
10 deletion
+55
-10
cmd/internal/assets/assets/initialize/run.sh
cmd/internal/assets/assets/initialize/run.sh
+0
-0
cmd/internal/initialize/initialize.go
cmd/internal/initialize/initialize.go
+16
-9
cmd/internal/packager/pkg_dpkg_linux.go
cmd/internal/packager/pkg_dpkg_linux.go
+39
-1
未找到文件。
cmd/internal/assets/assets/
packager/linux
/run.sh
→
cmd/internal/assets/assets/
initialize
/run.sh
浏览文件 @
c1db1a6f
文件已移动
cmd/internal/initialize/initialize.go
浏览文件 @
c1db1a6f
...
...
@@ -91,7 +91,7 @@ func generaProject(c *command.Config) error {
}
// 读取assets内的文件
var
createFile
=
func
(
readFilePath
,
outFilePath
string
,
data
map
[
string
]
any
)
error
{
var
createFile
=
func
(
readFilePath
,
outFilePath
string
,
data
map
[
string
]
any
,
perm
fs
.
FileMode
)
error
{
// 创建 energy.json template
if
fileData
,
err
:=
assets
.
ReadFile
(
nil
,
""
,
readFilePath
);
err
!=
nil
{
return
err
...
...
@@ -102,12 +102,19 @@ func generaProject(c *command.Config) error {
}
}
path
:=
filepath
.
Join
(
projectPath
,
outFilePath
)
if
err
=
ioutil
.
WriteFile
(
path
,
fileData
,
0666
);
err
!=
nil
{
if
err
=
ioutil
.
WriteFile
(
path
,
fileData
,
perm
);
err
!=
nil
{
return
err
}
}
return
nil
}
if
consts
.
IsLinux
/* && consts.IsARM64*/
{
if
err
:=
createFile
(
"assets/initialize/run.sh"
,
"run.sh"
,
nil
,
0755
);
err
!=
nil
{
return
err
}
}
// 创建 energy.json template
// 默认配置
data
:=
make
(
map
[
string
]
any
)
...
...
@@ -118,12 +125,12 @@ func generaProject(c *command.Config) error {
data
[
"CompanyName"
]
=
c
.
Init
.
Name
data
[
"ProductName"
]
=
c
.
Init
.
Name
energyJSON
:=
fmt
.
Sprintf
(
"assets/energy_%s.json"
,
runtime
.
GOOS
)
if
err
:=
createFile
(
energyJSON
,
consts
.
EnergyProjectConfig
,
data
);
err
!=
nil
{
if
err
:=
createFile
(
energyJSON
,
consts
.
EnergyProjectConfig
,
data
,
0666
);
err
!=
nil
{
return
err
}
// 创建 main.go
if
err
:=
createFile
(
fmt
.
Sprintf
(
"assets/initialize/main.go.%s"
,
c
.
Init
.
ResLoad
),
"main.go"
,
nil
);
err
!=
nil
{
if
err
:=
createFile
(
fmt
.
Sprintf
(
"assets/initialize/main.go.%s"
,
c
.
Init
.
ResLoad
),
"main.go"
,
nil
,
0666
);
err
!=
nil
{
return
err
}
...
...
@@ -132,7 +139,7 @@ func generaProject(c *command.Config) error {
data
[
"Name"
]
=
c
.
Init
.
Name
data
[
"GoVersion"
]
=
"1.18"
data
[
"EnergyVersion"
]
=
"latest"
if
err
:=
createFile
(
"assets/initialize/go.mod.t"
,
"go.mod"
,
data
);
err
!=
nil
{
if
err
:=
createFile
(
"assets/initialize/go.mod.t"
,
"go.mod"
,
data
,
0666
);
err
!=
nil
{
return
err
}
...
...
@@ -140,20 +147,20 @@ func generaProject(c *command.Config) error {
if
err
:=
os
.
MkdirAll
(
filepath
.
Join
(
projectPath
,
"resources"
),
fs
.
ModePerm
);
err
!=
nil
{
return
err
}
if
err
:=
createFile
(
"assets/initialize/index.html"
,
filepath
.
Join
(
"resources"
,
"index.html"
),
nil
);
err
!=
nil
{
if
err
:=
createFile
(
"assets/initialize/index.html"
,
filepath
.
Join
(
"resources"
,
"index.html"
),
nil
,
0666
);
err
!=
nil
{
return
err
}
if
err
:=
createFile
(
"assets/icon.ico"
,
filepath
.
Join
(
"resources"
,
"icon.ico"
),
nil
);
err
!=
nil
{
if
err
:=
createFile
(
"assets/icon.ico"
,
filepath
.
Join
(
"resources"
,
"icon.ico"
),
nil
,
0666
);
err
!=
nil
{
return
err
}
if
err
:=
createFile
(
"assets/icon.png"
,
filepath
.
Join
(
"resources"
,
"icon.png"
),
nil
);
err
!=
nil
{
if
err
:=
createFile
(
"assets/icon.png"
,
filepath
.
Join
(
"resources"
,
"icon.png"
),
nil
,
0666
);
err
!=
nil
{
return
err
}
// 创建 README.md
data
=
make
(
map
[
string
]
any
)
data
[
"Name"
]
=
c
.
Init
.
Name
if
err
:=
createFile
(
"assets/initialize/README.md"
,
"README.md"
,
data
);
err
!=
nil
{
if
err
:=
createFile
(
"assets/initialize/README.md"
,
"README.md"
,
data
,
0666
);
err
!=
nil
{
return
err
}
...
...
cmd/internal/packager/pkg_dpkg_linux.go
浏览文件 @
c1db1a6f
...
...
@@ -44,6 +44,7 @@ const (
const
(
linuxDebControl
=
"linux/control"
linuxAppDesktop
=
"linux/app.desktop"
linuxARMStartup
=
"linux/startup.sh"
)
func
GeneraInstaller
(
proj
*
project
.
Project
)
error
{
...
...
@@ -76,6 +77,10 @@ func GeneraInstaller(proj *project.Project) error {
if
err
=
linuxOptCopy
(
proj
,
appRoot
);
err
!=
nil
{
return
err
}
// copy linux arm startup.sh
if
err
=
linuxARMStartupSH
(
proj
,
appRoot
);
err
!=
nil
{
return
err
}
// 7zz 压缩 CEF
comper
:=
proj
.
NSIS
.
Compress
switch
comper
{
...
...
@@ -230,6 +235,35 @@ func linuxOptCopy(proj *project.Project, appRoot string) error {
return
nil
}
func
linuxARMStartupSH
(
proj
*
project
.
Project
,
appRoot
string
)
error
{
if
consts
.
IsLinux
/* && consts.IsARM64*/
{
term
.
Logger
.
Info
(
"Generate dpkg startup.sh"
)
buildOutDir
:=
assets
.
BuildOutPath
(
proj
)
appDir
:=
filepath
.
Join
(
buildOutDir
,
appRoot
)
if
startupshData
,
err
:=
assets
.
ReadFile
(
proj
,
assetsFSPath
,
linuxARMStartup
);
err
!=
nil
{
return
err
}
else
{
data
:=
make
(
map
[
string
]
any
)
data
[
"CEFPATH"
]
=
opt
(
proj
)
data
[
"EXECUTE"
]
=
proj
.
Name
if
content
,
err
:=
tools
.
RenderTemplate
(
string
(
startupshData
),
data
);
err
!=
nil
{
return
err
}
else
{
optDir
:=
opt
(
proj
)
outFilePath
:=
filepath
.
Join
(
appDir
,
optDir
,
fmt
.
Sprintf
(
"%s.sh"
,
proj
.
Name
))
outFile
,
err
:=
os
.
OpenFile
(
outFilePath
,
os
.
O_CREATE
|
os
.
O_WRONLY
,
0755
)
if
err
!=
nil
{
return
err
}
defer
outFile
.
Close
()
outFile
.
Write
(
content
)
}
}
}
return
nil
}
func
linuxDesktop
(
proj
*
project
.
Project
,
appRoot
string
)
error
{
term
.
Logger
.
Info
(
"Generate dpkg desktop"
)
buildOutDir
:=
assets
.
BuildOutPath
(
proj
)
...
...
@@ -244,9 +278,13 @@ func linuxDesktop(proj *project.Project, appRoot string) error {
}
else
{
optDir
:=
opt
(
proj
)
_
,
icon
:=
filepath
.
Split
(
proj
.
Info
.
Icon
)
startup
:=
proj
.
Name
if
consts
.
IsLinux
/* && consts.IsARM64*/
{
startup
+=
".sh"
}
data
:=
make
(
map
[
string
]
any
)
data
[
"Name"
]
=
proj
.
Name
data
[
"Exec"
]
=
filepath
.
Join
(
optDir
,
proj
.
Name
)
data
[
"Exec"
]
=
filepath
.
Join
(
optDir
,
startup
)
data
[
"Icon"
]
=
filepath
.
Join
(
optDir
,
icon
)
data
[
"Comments"
]
=
proj
.
Info
.
Comments
if
content
,
err
:=
tools
.
RenderTemplate
(
string
(
desktopData
),
data
);
err
!=
nil
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录