Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
eepm
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
etersoft
eepm
Commits
eb6b7ae2
Commit
eb6b7ae2
authored
May 14, 2023
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
small fixes
parent
f7394acd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
3 deletions
+13
-3
epm
bin/epm
+1
-1
epm-pack
bin/epm-pack
+12
-2
No files found.
bin/epm
View file @
eb6b7ae2
...
@@ -621,7 +621,7 @@ if [ -n "$quiet" ] ; then
...
@@ -621,7 +621,7 @@ if [ -n "$quiet" ] ; then
fi
fi
# fill
# fill
export
EPM_OPTIONS
=
"
$nodeps
$force
$verbose
$quiet
$interactive
$non_interactive
$save_only
$download_only
"
export
EPM_OPTIONS
=
"
$nodeps
$force
$verbose
$
debug
$
quiet
$interactive
$non_interactive
$save_only
$download_only
"
# if input is not console and run script from file, get pkgs from stdin too
# if input is not console and run script from file, get pkgs from stdin too
if
[
!
-n
"
$inscript
"
]
&&
!
inputisatty
&&
[
-n
"
$PROGDIR
"
]
;
then
if
[
!
-n
"
$inscript
"
]
&&
!
inputisatty
&&
[
-n
"
$PROGDIR
"
]
;
then
...
...
bin/epm-pack
View file @
eb6b7ae2
...
@@ -30,6 +30,7 @@ __epm_pack_run_handler()
...
@@ -30,6 +30,7 @@ __epm_pack_run_handler()
local
packname
=
"
$1
"
local
packname
=
"
$1
"
local
tarname
=
"
$2
"
local
tarname
=
"
$2
"
local
packversion
=
"
$3
"
local
packversion
=
"
$3
"
local
url
=
"
$3
"
returntarname
=
''
returntarname
=
''
local
repackcode
=
"
$EPM_PACK_SCRIPTS_DIR
/
$packname
.sh"
local
repackcode
=
"
$EPM_PACK_SCRIPTS_DIR
/
$packname
.sh"
...
@@ -43,7 +44,8 @@ __epm_pack_run_handler()
...
@@ -43,7 +44,8 @@ __epm_pack_run_handler()
local
bashopt
=
''
local
bashopt
=
''
[
-n
"
$debug
"
]
&&
bashopt
=
'-x'
[
-n
"
$debug
"
]
&&
bashopt
=
'-x'
#info "Running $($script --description 2>/dev/null) ..."
#info "Running $($script --description 2>/dev/null) ..."
(
unset
EPMCURDIR
;
export
PATH
=
$SCPATH
;
docmd
$CMDSHELL
$bashopt
$repackcode
"
$tarname
"
"
$filefortarname
"
"
$packversion
"
)
||
fatal
# TODO: add url info here
(
unset
EPMCURDIR
;
export
PATH
=
$SCPATH
;
docmd
$CMDSHELL
$bashopt
$repackcode
"
$tarname
"
"
$filefortarname
"
"
$packversion
"
"
$url
"
)
||
fatal
returntarname
=
"
$(
cat
"
$filefortarname
"
)
"
||
fatal
"pack script
$repackcode
didn't set tarname"
returntarname
=
"
$(
cat
"
$filefortarname
"
)
"
||
fatal
"pack script
$repackcode
didn't set tarname"
[
-s
"
$returntarname
"
]
||
fatal
"pack script for
$packname
return unexist
$returntarname
file"
[
-s
"
$returntarname
"
]
||
fatal
"pack script for
$packname
return unexist
$returntarname
file"
return
0
return
0
...
@@ -53,6 +55,7 @@ __epm_pack_run_handler()
...
@@ -53,6 +55,7 @@ __epm_pack_run_handler()
__epm_pack
()
__epm_pack
()
{
{
local
packname
=
"
$1
"
local
packname
=
"
$1
"
local
URL
=
"
$4
"
# fills returntarname with packed tar
# fills returntarname with packed tar
__epm_pack_run_handler
"
$@
"
||
fatal
"Can't find pack script for packname
$packname
"
__epm_pack_run_handler
"
$@
"
||
fatal
"Can't find pack script for packname
$packname
"
...
@@ -62,6 +65,9 @@ __epm_pack()
...
@@ -62,6 +65,9 @@ __epm_pack()
return
return
fi
fi
# TODO: merge eepm.yaml here (common with $returntarname.eepm.yaml)
# add upstream_url: $URL too
# repack if needed
# repack if needed
repacked_pkgs
=
''
repacked_pkgs
=
''
# repack to our target
# repack to our target
...
@@ -90,7 +96,9 @@ __epm_pack()
...
@@ -90,7 +96,9 @@ __epm_pack()
# we need put result in the cur dir
# we need put result in the cur dir
mv
-v
"
$pkgname
"
$EPMCURDIR
||
fatal
mv
-v
"
$pkgname
"
$EPMCURDIR
||
fatal
[
-r
"
$pkgname
.eepm.yaml"
]
&&
mv
-v
"
$pkgname
.eepm.yaml"
$EPMCURDIR
return
0
}
}
epm_pack_help
()
epm_pack_help
()
...
@@ -126,10 +134,12 @@ epm_pack()
...
@@ -126,10 +134,12 @@ epm_pack()
local
packname
=
"
$1
"
local
packname
=
"
$1
"
local
tarname
=
"
$2
"
local
tarname
=
"
$2
"
local
packversion
=
"
$3
"
local
packversion
=
"
$3
"
local
url
=
''
[
-n
"
$packname
"
]
||
fatal
"run with packname, see --help"
[
-n
"
$packname
"
]
||
fatal
"run with packname, see --help"
if
is_url
"
$tarname
"
;
then
if
is_url
"
$tarname
"
;
then
url
=
"
$tarname
"
pkg_urls
=
"
$tarname
"
pkg_urls
=
"
$tarname
"
load_helper epm-download
load_helper epm-download
cd
$tmpdir
||
fatal
cd
$tmpdir
||
fatal
...
@@ -147,6 +157,6 @@ epm_pack()
...
@@ -147,6 +157,6 @@ epm_pack()
fi
fi
cd
$tmpdir
||
fatal
cd
$tmpdir
||
fatal
__epm_pack
"
$packname
"
"
$tarname
"
"
$packversion
"
__epm_pack
"
$packname
"
"
$tarname
"
"
$packversion
"
"
$url
"
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment