From 5b53470cf0491b9378e0a48325e98230569d68b1 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 10 Nov 2014 12:46:00 +0000
Subject: init: minor refactor of find_ovl

use 'set' instead of 'ls' to find duplicate apkovls
---
 initramfs-init.in | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'initramfs-init.in')

diff --git a/initramfs-init.in b/initramfs-init.in
index 22daede..8de3e8d 100755
--- a/initramfs-init.in
+++ b/initramfs-init.in
@@ -49,8 +49,6 @@ scan_drivers() {
 
 find_ovl() {
 	local mnt="$1"
-	local ovl
-	local lines
 
 	if [ -n "$APKOVL" ]; then
 		[ -f "$mnt/$APKOVL" ] && echo "$mnt/$APKOVL"
@@ -58,14 +56,13 @@ find_ovl() {
 	fi
 
 	# look for apkovl's on mounted media
-	ovl=$( ls -1 "$mnt"/*.apkovl.tar.gz* 2>/dev/null ) || return 1
-	lines=$(echo "$ovl" | wc -l)
+	set -- "$mnt"/*.apkovl.tar.gz*
 
-	if [ $lines -gt 1 ] ; then
+	if [ $# -gt 1 ] ; then
 		echo "ERROR: More than one apkovl file was found on $(basename $mnt). None will be read." >&2
 		return 1
 	fi
-	echo "$ovl"
+	echo "$1"
 }
 
 retry_mount() {
-- 
cgit v1.2.3