SliTaz Repositories

     1.1 --- a/modules/find-depends	Tue Aug 11 01:09:15 2015 +0300
     1.2 +++ b/modules/find-depends	Fri Aug 28 16:10:34 2015 +0300
     1.3 @@ -5,7 +5,7 @@
     1.4  
     1.5  
     1.6  # Need by check_depends
     1.7 -TMPLOCALSTATE=
     1.8 +unset TMPLOCALSTATE
     1.9  
    1.10  
    1.11  # Check for ELF file
    1.12 @@ -29,21 +29,21 @@
    1.13  
    1.14  	[ -z "$TMPLOCALSTATE" ] && TMPLOCALSTATE="$PKGS_DB"
    1.15  	[ ! -f "$TMPLOCALSTATE/files.list.lzma" ] && tazpkg recharge >/dev/null
    1.16 -	for i in $TMPLOCALSTATE/files.list.lzma \
    1.17 -		$TMPLOCALSTATE/undigest/*/files.list.lzma ; do
    1.18 -		[ -f "$i" ] && lzma d $i -so >> $TMP_DIR/files.list
    1.19 +	for i in "$TMPLOCALSTATE/files.list.lzma" \
    1.20 +		"$TMPLOCALSTATE/undigest/"*"/files.list.lzma"; do
    1.21 +		[ -f "$i" ] && lzma d "$i" -so >> "$TMP_DIR/files.list"
    1.22  	done
    1.23  
    1.24  	_ 'Find depends...' 1>&2
    1.25  	libs_found=''
    1.26 -	find ${1:-$TMP_DIR/$file/fs} -type f | \
    1.27 -	while read chkfile ; do
    1.28 +	find "${1:-$TMP_DIR/$file/fs}" -type f | \
    1.29 +	while read chkfile; do
    1.30  		is_elf "$chkfile" || continue
    1.31  		case "$chkfile" in
    1.32  			*.o|*.ko|*.ko.gz|*.ko.xz) continue;;
    1.33  		esac
    1.34  
    1.35 -		for lib in $(ldd "$chkfile" | sed '/=>/!d;s/ =>.*//') ; do
    1.36 +		for lib in $(ldd "$chkfile" | sed '/=>/!d;s/ =>.*//'); do
    1.37  			case " $libs_found " in
    1.38  				*\ $lib\ *) continue
    1.39  			esac
    1.40 @@ -51,7 +51,7 @@
    1.41  			case "$lib" in
    1.42  				statically|linux-gate.so*|ld-*.so|*/ld-*.so) continue;;
    1.43  			esac
    1.44 -			find ${1:-$TMP_DIR/$file/fs} | grep -q /$lib$ && continue
    1.45 +			find "${1:-$TMP_DIR/$file/fs}" | grep -q /$lib$ && continue
    1.46  
    1.47  			_n 'for %s' "$lib" 1>&2
    1.48  			echo -ne "                   \r" 1>&2
    1.49 @@ -60,21 +60,21 @@
    1.50  				case " $DEFAULT_DEPENDS " in
    1.51  					*\ $dep\ *) continue 2;;
    1.52  				esac
    1.53 -				grep -qs "^$dep$" $TMP_DIR/depends && continue 2
    1.54 +				grep -qs "^$dep$" "$TMP_DIR/depends" && continue 2
    1.55  			done
    1.56  
    1.57  			if [ -n "$dep" ]; then
    1.58 -				echo "$dep" >> $TMP_DIR/depends
    1.59 +				echo "$dep" >> "$TMP_DIR/depends"
    1.60  			else
    1.61 -				grep -qs ^$lib$ $TMP_DIR/unresolved ||
    1.62 -					echo "$lib" >> $TMP_DIR/unresolved
    1.63 +				grep -qs ^$lib$ "$TMP_DIR/unresolved" ||
    1.64 +					echo "$lib" >> "$TMP_DIR/unresolved"
    1.65  			fi
    1.66  		done
    1.67  	done
    1.68  
    1.69  	spc=''
    1.70  	[ -s "$TMP_DIR/depends" ] &&
    1.71 -	sort < $TMP_DIR/depends 2>/dev/null | uniq | \
    1.72 +	sort < "$TMP_DIR/depends" 2>/dev/null | uniq | \
    1.73  	while read file; do
    1.74  		echo -n "$spc$file"
    1.75  		spc=' '