Skip to content

E
eepm
Commit 0b4c6697 authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

epm repack.d/common.sh: make fatal on missed target bin

parent f6c2515d
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 3 deletions
repack.d/common.sh
View file @ 0b4c6697
...@@ -180,6 +180,12 @@ create_file() ...@@ -180,6 +180,12 @@ create_file()
install_file /dev/stdin $t install_file /dev/stdin $t
} }
__check_target_bin()
{
local target="$1"
is_abs_path "$target" || return 0
chmod 0755 "$BUILDROOT$target" || fatal
}
add_bin_link_command() add_bin_link_command()
{ {
...@@ -190,7 +196,7 @@ add_bin_link_command() ...@@ -190,7 +196,7 @@ add_bin_link_command()
[ -e "$BUILDROOT/usr/bin/$name" ] && return [ -e "$BUILDROOT/usr/bin/$name" ] && return
[ "$name" = "$target" ] && return [ "$name" = "$target" ] && return
is_abs_path "$target" && chmod 0755 "$BUILDROOT$target" __check_target_bin "$target"
mkdir -p $BUILDROOT/usr/bin/ mkdir -p $BUILDROOT/usr/bin/
ln -s "$target" "$BUILDROOT/usr/bin/$name" || return ln -s "$target" "$BUILDROOT/usr/bin/$name" || return
pack_file "/usr/bin/$name" pack_file "/usr/bin/$name"
...@@ -206,7 +212,7 @@ add_bin_exec_command() ...@@ -206,7 +212,7 @@ add_bin_exec_command()
[ -e "$BUILDROOT/usr/bin/$name" ] && return [ -e "$BUILDROOT/usr/bin/$name" ] && return
[ "$name" = "$target" ] && return [ "$name" = "$target" ] && return
is_abs_path "$target" && chmod 0755 "$BUILDROOT$target" __check_target_bin "$target"
mkdir -p $BUILDROOT/usr/bin/ mkdir -p $BUILDROOT/usr/bin/
cat <<EOF > "$BUILDROOT/usr/bin/$name" cat <<EOF > "$BUILDROOT/usr/bin/$name"
#!/bin/sh #!/bin/sh
...@@ -225,7 +231,7 @@ add_bin_cdexec_command() ...@@ -225,7 +231,7 @@ add_bin_cdexec_command()
[ -e "$BUILDROOT/usr/bin/$name" ] && return [ -e "$BUILDROOT/usr/bin/$name" ] && return
[ "$name" = "$target" ] && return [ "$name" = "$target" ] && return
is_abs_path "$target" && chmod 0755 "$BUILDROOT$target" __check_target_bin "$target"
mkdir -p $BUILDROOT/usr/bin/ mkdir -p $BUILDROOT/usr/bin/
cat <<EOF > "$BUILDROOT/usr/bin/$name" cat <<EOF > "$BUILDROOT/usr/bin/$name"
#!/bin/sh #!/bin/sh
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment