X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fipkg-make-index.sh;h=31b4327da34ccfeb8f190f064cd8ac0e50bed185;hb=63c8fa0bbb119d27bfcee448f7ef3d68e9b900ad;hp=46051045ae072a817898aca26556b83716f0e59f;hpb=97eaa9e31ee443fc8e53a42466bdc6dd95f67989;p=15.05%2Fopenwrt.git

diff --git a/scripts/ipkg-make-index.sh b/scripts/ipkg-make-index.sh
index 46051045ae..31b4327da3 100755
--- a/scripts/ipkg-make-index.sh
+++ b/scripts/ipkg-make-index.sh
@@ -1,21 +1,24 @@
-#!/bin/sh
+#!/usr/bin/env bash
 set -e
 
 pkg_dir=$1
 
 if [ -z $pkg_dir ] || [ ! -d $pkg_dir ]; then
-	echo "Usage: ipkg-make-index <package_directory>"
+	echo "Usage: ipkg-make-index <package_directory>" >&2
 	exit 1
 fi
 
-which md5sum 2>&1 >/dev/null || alias md5sum=md5
+which md5sum >/dev/null 2>&1 || alias md5sum=md5
 
 for pkg in `find $pkg_dir -name '*.ipk' | sort`; do
+	name="${pkg##*/}"
+	name="${name%%_*}"
+	[[ "$name" = "kernel" ]] && continue
 	echo "Generating index for package $pkg" >&2
 	file_size=$(ls -l $pkg | awk '{print $5}')
 	md5sum=$(md5sum $pkg | awk '{print $1}')
 	# Take pains to make variable value sed-safe
-	sed_safe_pkg=`echo $pkg | sed -e 's/\\//\\\\\\//g'`
+	sed_safe_pkg=`echo $pkg | sed -e 's/^\.\///g' -e 's/\\//\\\\\\//g'`
 	tar -xzOf $pkg ./control.tar.gz | tar xzOf - ./control | sed -e "s/^Description:/Filename: $sed_safe_pkg\\
 Size: $file_size\\
 MD5Sum: $md5sum\\