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
695fba55
Commit
695fba55
authored
Apr 06, 2024
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
epm-repack-rpm: rewrite rpm-build checking (try install eepm-rpmbuild firstly)
parent
79356063
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
26 additions
and
19 deletions
+26
-19
epm-repack-rpm
bin/epm-repack-rpm
+26
-19
No files found.
bin/epm-repack-rpm
View file @
695fba55
...
@@ -105,23 +105,43 @@ EOF
...
@@ -105,23 +105,43 @@ EOF
}
}
# will set RPMBUILD
# will set RPMBUILD
__
try_install_eepm
_rpmbuild
()
__
assure_exists
_rpmbuild
()
{
{
# checking both if they already installed
RPMBUILD
=
/usr/bin/eepm-rpmbuild
if
[
-x
$RPMBUILD
]
;
then
info
"will use eepm-rpmbuild for rpm packing"
export
EPM_RPMBUILD
=
$RPMBUILD
return
fi
RPMBUILD
=
/usr/bin/rpmbuild
RPMBUILD
=
/usr/bin/rpmbuild
[
-x
"
$RPMBUILD
"
]
&&
return
[
-x
"
$RPMBUILD
"
]
&&
return
# try install eepm-rpm-build
RPMBUILD
=
/usr/bin/eepm-rpmbuild
RPMBUILD
=
/usr/bin/eepm-rpmbuild
if
[
!
-x
$RPMBUILD
]
;
then
try_assure_exists
$RPMBUILD
eepm-rpm-build
epm
install
eepm-rpm-build
fi
if
[
-x
$RPMBUILD
]
;
then
if
[
-x
$RPMBUILD
]
;
then
warning
"will use eepm-rpmbuild for rpm packing"
info
"will use eepm-rpmbuild for rpm packing"
export
EPM_RPMBUILD
=
$RPMBUILD
export
EPM_RPMBUILD
=
$RPMBUILD
return
return
fi
fi
# return to the default
RPMBUILD
=
/usr/bin/rpmbuild
RPMBUILD
=
/usr/bin/rpmbuild
# TODO: check for all systems
case
$PKGFORMAT
in
rpm
)
assure_exists
$RPMBUILD
rpm-build
;;
deb
)
assure_exists
$RPMBUILD
rpm
;;
esac
}
}
# will fill repacked_pkg var
# will fill repacked_pkg var
...
@@ -134,20 +154,7 @@ __epm_repack_to_rpm()
...
@@ -134,20 +154,7 @@ __epm_repack_to_rpm()
assure_exists fakeroot
assure_exists fakeroot
# will set RPMBUILD
# will set RPMBUILD
__try_install_eepm_rpmbuild
__assure_exists_rpmbuild
if
[
!
-x
$RPMBUILD
]
;
then
RPMBUILD
=
/usr/bin/rpmbuild
# TODO: check for all systems
case
$PKGFORMAT
in
rpm
)
assure_exists
$RPMBUILD
rpm-build
;;
deb
)
assure_exists
$RPMBUILD
rpm
;;
esac
fi
umask
022
umask
022
...
...
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