diff options
| -rwxr-xr-x | preseed.sh | 2 | ||||
| -rwxr-xr-x | src/getname.sh | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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" |