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
Vladislav
eepm
Commits
9387be94
Commit
9387be94
authored
1 year ago
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
epm repack: add __epm_check_repack_rule(), change __epm_have_repack_rule() and use it
parent
d18315a4
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
6 deletions
+11
-6
epm-pack
bin/epm-pack
+1
-1
epm-repack
bin/epm-repack
+10
-5
No files found.
bin/epm-pack
View file @
9387be94
...
...
@@ -85,7 +85,7 @@ __epm_pack()
# don't repack by default there is our pkg format
__epm_split_by_pkg_type
$PKGFORMAT
$returntarname
&&
dorepack
=
''
# repack if we have a repack rule for it
[
-z
"
$norepack
"
]
&&
__epm_
have
_repack_rule
$returntarname
&&
dorepack
=
'--repack'
[
-z
"
$norepack
"
]
&&
__epm_
check
_repack_rule
$returntarname
&&
dorepack
=
'--repack'
# repack if forced
[
-n
"
$repack
"
]
&&
dorepack
=
'--repack'
...
...
This diff is collapsed.
Click to expand it.
bin/epm-repack
View file @
9387be94
...
...
@@ -25,6 +25,14 @@ load_helper epm-status
__epm_have_repack_rule
()
{
# FIXME: use real way (for any archive)
local
pkgname
=
"
$(
epm print name
for
package
"
$1
"
)
"
local
repackcode
=
"
$EPM_REPACK_SCRIPTS_DIR
/
$pkgname
.sh"
[
-s
"
$repackcode
"
]
}
__epm_check_repack_rule
()
{
# skip repacking on non ALT systems
[
"
$BASEDISTRNAME
"
=
"alt"
]
||
return
1
...
...
@@ -33,17 +41,14 @@ __epm_have_repack_rule()
# skip for packages built with repack
epm_status_repacked
"
$i
"
&&
return
1
# FIXME: use real way (for any archive)
local
pkgname
=
"
$(
epm print name
for
package
"
$i
"
)
"
local
repackcode
=
"
$EPM_REPACK_SCRIPTS_DIR
/
$pkgname
.sh"
[
-s
"
$repackcode
"
]
||
return
1
__epm_have_repack_rule
"
$i
"
||
return
1
done
return
0
}
__epm_check_if_needed_repack
()
{
__epm_
have
_repack_rule
"
$@
"
||
return
__epm_
check
_repack_rule
"
$@
"
||
return
local
pkgname
=
"
$(
epm print name
for
package
"
$1
"
)
"
warning
"There is repack rule for '
$pkgname
' package. It is better install this package via 'epm install --repack' or 'epm play'."
}
...
...
This diff is collapsed.
Click to expand it.
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