Skip to contentSkip to conversation

opkg-unbuild: convert to shell

PATCH Alejandro del Castillo 1 participant 1 message Jan 17, 2020 1 message not in the archive

lore
Share & tools
lore
#1 lore raw
In reply to a message not in the archive

Thanks for fixing this!

Some of the scripts on opkg-utils haven't seen a change in a long time and need refresh.

LGTM, merged into master

Quoted 133 lines · Christian Hermann

The previous implementation relied on python, it shelled out anyway (using bashisms) to call ar/tar and couldn't handle paths != cwd.

This rewrite
* can handle packages elsewhere than cwd
* prints a summary like opkg-build does ("Unbuilt <IPK> into <DEST>")
* is written in valid POSIX shell syntax
* is compatible with opkg-build's non-esoteric options
* is linted with shellcheck.

Tested with
* different tar
* gnu tar 1.32
* bsdtar 3.4.1
* busybox-tar 1.31.1
* toybox-tar 0.8.2 (but prints a warning: tar: './' not under '/tmp/dest/foo')
* some opkg-build arguments, as of opkg-build -o root -g root $args, with
* args=
* args="-Z xz"
* args="-c"
* args="-c -Z xz"

---
  opkg-unbuild | 93 +++++++++++++++++++++++++++++++++++++++++-----------
  1 file changed, 73 insertions(+), 20 deletions(-)
opkg-unbuild +73 -20
index 3189527..27096a1 100755
@@ -1,27 +1,80 @@
-#!/usr/bin/env python3
+#!/bin/sh -e
+# opkg-unbuild PKG... - extract packages to the current directory
+
  # SPDX-License-Identifier: GPL-2.0-only
-from __future__ import absolute_import
-from __future__ import print_function
+# Author: Christian Hermann <[email protected]>
+
+fail() { printf -- 'FAIL: %s\n' "$1" >&2 ; exit "${2:-1}" ; }
+usage() {
+	printf '%s\n' "Usage: $(basename "$0") PKG..."
+	printf '%s\n' "    Extract debian compatible packages to the current directory"
+}
+
+# map file suffix to tar compression flag
+get_tar_comp_flag() {
+	case "$1" in
+		# avoid -a, which has a different meaning in busybox-tar
+		*tar.gz|*tgz) printf -- '-z' ;;
+		*tar.xz|*txz) printf -- '-J' ;;
+		*tar.bz2|*tbz|*tbz2) printf -- '-j' ;;
+		*tar.lzma|*tlz) printf -- '--auto-compress' ;;
+		*) printf -- '--auto-compress' ;;
+	esac
+}
+
+
+if [ "$#" -lt 1 ] ; then
+	usage >&2
+	exit 1
+fi
+if [ "$1" = "-h" ] || [ "$1" = "--help" ] ; then
+	usage
+	exit 0
+fi
+
+while [ -n "$1" ] ; do
+	filename="$1"
+	shift
+
+	[ ! -r "$filename" ] && fail "Cannot read file: $filename"
 
-import sys, os, re
+	# Prepare directory name (strip suffix)
+	pkgname="$(basename "$filename")"
+	pkgdir="./$(printf '%s' "$pkgname" | sed -E 's/\.((ipk)|(opk)|(deb))//')/"
 
-if (len(sys.argv) == 0):
-    print('usage: %s: package.opk' % sys.argv[0])
-    sys.exit(1)
+	# Skip this package if there's a naming clash with the target dir
+	if [ -d "$pkgdir" ]; then
+		printf '%s\n' "Destination already exists: $pkgdir (skipping)" >&2
+		continue
+	fi
 
-for filename in sys.argv[1:]:
-    m = re.match('((.*/)*)(.*)', filename)
-    pkg = m.group(3)
-    m = re.match('(.*)((.opk)|(.deb)|(.ipk))', filename)
-    if m:
-        pkg = m.group(1)
+	# Analyze outer layer, prefer ar over tar
+	outer_ext_cmd=
+	table=
+	if ar t "$filename" >/dev/null 2>&1 ; then
+		outer_ext_cmd="ar p "
+		table="$(ar t "$filename" 2>/dev/null)"
+	elif tar t -f "$filename" >/dev/null 2>&1 ; then
+		outer_ext_cmd="tar -x --to-stdout --file "
+		table="$(tar -t -f "$filename")"
+	fi
+	[ -z "$table" ] && fail "Could not read file table: $filename"
 
-    os.system('rm -fr %s' % pkg)
-    os.mkdir(pkg)
-    os.mkdir(pkg + '/CONTROL')
+	# Analyze inner layer.  Choose decompression algo for inner archives as
+	# indicated by their suffix.  Query the real paths from the outer archive's
+	# table, since tar's table prefixes them with ./ while ar's does not.
+	control_path="$(printf '%s' "$table" | grep control)"
+	data_path="$(printf '%s' "$table" | grep data)"
+	[ -z "$control_path" ] && fail "Archive has no control.tar.gz: $filename"
+	[ -z "$data_path" ] && fail "Archive has no data.tar.gz: $filename"
+	inner_comp_control="$(get_tar_comp_flag "$control_path")"
+	inner_comp_data="$(get_tar_comp_flag "$data_path")"
 
-    os.system('cd %s; (ar x ../%s || tar zxf ../%s) >& /dev/null' % (pkg, filename, filename))
+	# Extract
+	mkdir -p "$pkgdir/CONTROL"
+	$outer_ext_cmd "$filename" "$control_path" | tar --extract -f - "$inner_comp_control" -C "$pkgdir/CONTROL"
+	$outer_ext_cmd "$filename" "$data_path" | tar --extract -f - "$inner_comp_data" -C "$pkgdir/"
 
-    os.system('tar xzf %s/data.tar.gz -C %s' % (pkg, pkg))
-    os.system('tar xzf %s/control.tar.gz -C %s/CONTROL' % (pkg, pkg))
-    os.system('rm -f %s/control.tar.gz %s/data.tar.gz %s/debian-binary' % (pkg, pkg, pkg))
+	# Summary
+	printf 'Unbuilt %s into %s\n' "$filename" "$pkgdir"
+done
Signature · 3 lines
Cheers,

Alejandro