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
e7496cb5
Commit
e7496cb5
authored
Apr 13, 2024
by
Vitaly Lipatov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
epm repackd./common.sh: add_bin_*_command: improved target checking
parent
68e4b4d4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
common.sh
repack.d/common.sh
+10
-6
No files found.
repack.d/common.sh
View file @
e7496cb5
...
...
@@ -183,8 +183,15 @@ create_file()
__check_target_bin
()
{
local
target
=
"
$1
"
is_abs_path
"
$target
"
||
return
0
chmod
0755
"
$BUILDROOT$target
"
||
fatal
if
is_abs_path
"
$target
"
;
then
# if target does not exist
[
-e
"
$BUILDROOT$target
"
]
||
fatal
"fatal on broken link creating"
chmod
0755
"
$BUILDROOT$target
"
||
fatal
else
# if target is a relative, skiping when /usr/bin/$name exists
[
-e
"
$BUILDROOT
/usr/bin/
$name
"
]
&&
return
fi
}
add_bin_link_command
()
...
...
@@ -193,12 +200,11 @@ add_bin_link_command()
local
target
=
"
$2
"
[
-n
"
$name
"
]
||
name
=
"
$PRODUCT
"
[
-n
"
$target
"
]
||
target
=
"
$PRODUCTDIR
/
$name
"
[
-e
"
$BUILDROOT
/usr/bin/
$name
"
]
&&
return
[
"
$name
"
=
"
$target
"
]
&&
return
__check_target_bin
"
$target
"
mkdir
-p
$BUILDROOT
/usr/bin/
ln
-s
"
$target
"
"
$BUILDROOT
/usr/bin/
$name
"
||
return
ln
-s
f
"
$target
"
"
$BUILDROOT
/usr/bin/
$name
"
||
return
pack_file
"/usr/bin/
$name
"
}
...
...
@@ -209,7 +215,6 @@ add_bin_exec_command()
local
target
=
"
$2
"
[
-n
"
$name
"
]
||
name
=
"
$PRODUCT
"
[
-n
"
$target
"
]
||
target
=
"
$PRODUCTDIR
/
$name
"
[
-e
"
$BUILDROOT
/usr/bin/
$name
"
]
&&
return
[
"
$name
"
=
"
$target
"
]
&&
return
__check_target_bin
"
$target
"
...
...
@@ -228,7 +233,6 @@ add_bin_cdexec_command()
local
target
=
"
$2
"
[
-n
"
$name
"
]
||
name
=
"
$PRODUCT
"
[
-n
"
$target
"
]
||
target
=
"
$PRODUCTDIR
/
$name
"
[
-e
"
$BUILDROOT
/usr/bin/
$name
"
]
&&
return
[
"
$name
"
=
"
$target
"
]
&&
return
__check_target_bin
"
$target
"
...
...
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