aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuilhem Moulin <guilhem@fripost.org>2017-05-29 18:40:13 +0200
committerGuilhem Moulin <guilhem@fripost.org>2017-05-29 18:40:13 +0200
commit338b72256a3637076ce2741c69b2d8bdb9bb0754 (patch)
treee3cdc95b65bc479d67bf02de5fc9fd498d9f88a0
parent00a0ba11f1e3b6d7a64a29e14211c0800e836f2c (diff)
udeb: only copy generated .udeb files to the iso image.
-rwxr-xr-xpreseed.sh2
-rwxr-xr-xsrc/getname.sh4
2 files changed, 3 insertions, 3 deletions
diff --git a/preseed.sh b/preseed.sh
index 0ab9513..4eb8d72 100755
--- a/preseed.sh
+++ b/preseed.sh
@@ -79,7 +79,7 @@ gunzip "$isoeditdir/$packages.gz"
while [ $# -gt 0 ]; do
cd "${1%%_*}-udeb"; shift
name="$(sed -n 's/Package:\s\s*//p' ./debian/control)"
- udeb=$(cut -d' ' -f1 ./debian/files)
+ udeb="$(sed -nr '/^(\S+\.udeb)(\s.*)?$/ {s//\1/p;q}' ./debian/files)"
dir="pool/main/$(expr substr "$name" 1 1)/$name"
mkdir -p "$isoeditdir/$dir/"
cp ../"$udeb" "$isoeditdir/$dir/"
diff --git a/src/getname.sh b/src/getname.sh
index 3bd5bf6..071bc59 100755
--- a/src/getname.sh
+++ b/src/getname.sh
@@ -15,11 +15,11 @@ if [ $# -gt 0 ]; then
*-udeb);;
*) name="${name%.udeb}"; name="${name%%_*}-udeb";;
esac
- echo $name
+ echo "$name"
else
for dir in src/*-udeb/; do
if [ -r "$dir/debian/files" ]; then
- echo src/$(cut -d' ' -f1 "$dir/debian/files")
+ echo src/"$(sed -nr '/^(\S+\.udeb)(\s.*)?$/ {s//\1/p;q}' "$dir/debian/files")"
else
deb_arch=$(dpkg-architecture -qDEB_HOST_ARCH ${ARCH:+-a$ARCH})
sed -nr "s@^(\S+) \(([0-9.]+)\).*@src/\1_\2_${deb_arch}.udeb@p" "$dir/debian/changelog"