forked from pool/alsa-utils
Takashi Iwai
3353140a95
- Backport upstream fixes, including the fix for alsa-info (boo#928394): 0001-amixer-Don-t-set-only-the-first-item-in-sset_enum.patch 0002-amixer-expand-local-storage-for-item-name-according-.patch 0003-alsa-info-Don-t-try-update-when-wget-isn-t-available.patch OBS-URL: https://build.opensuse.org/request/show/304257 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=116
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 8188c2466a7d2179aba4e243ff2b85363961f9f1 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Mon, 27 Apr 2015 21:27:05 +0200
|
|
Subject: [PATCH 3/3] alsa-info: Don't try update when wget isn't available
|
|
|
|
... otherwise it overwrites a zero size file. Also add a check of
|
|
zero size file in the update procedure, too.
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
alsa-info/alsa-info.sh | 9 ++++++---
|
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/alsa-info/alsa-info.sh b/alsa-info/alsa-info.sh
|
|
index acd849588141..0bc4cd0612fb 100755
|
|
--- a/alsa-info/alsa-info.sh
|
|
+++ b/alsa-info/alsa-info.sh
|
|
@@ -35,6 +35,8 @@ BGTITLE="ALSA-Info v $SCRIPT_VERSION"
|
|
PASTEBINKEY="C9cRIO8m/9y8Cs0nVs0FraRx7U0pHsuc"
|
|
#Define some simple functions
|
|
|
|
+WGET=$(which wget 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null)
|
|
+
|
|
pbcheck(){
|
|
[[ $UPLOAD = "no" ]] && return
|
|
|
|
@@ -46,10 +48,12 @@ pbcheck(){
|
|
}
|
|
|
|
update() {
|
|
+ test -z "$WGET" -o ! -x "$WGET" && return
|
|
+
|
|
SHFILE=`mktemp -t alsa-info.XXXXXXXXXX` || exit 1
|
|
wget -O $SHFILE "http://www.alsa-project.org/alsa-info.sh" >/dev/null 2>&1
|
|
REMOTE_VERSION=`grep SCRIPT_VERSION $SHFILE |head -n1 |sed 's/.*=//'`
|
|
- if [ "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then
|
|
+ if [ -s "$SHFILE" -a "$REMOTE_VERSION" != "$SCRIPT_VERSION" ]; then
|
|
if [[ -n $DIALOG ]]
|
|
then
|
|
OVERWRITE=
|
|
@@ -831,8 +835,7 @@ if [ "$UPLOAD" = "no" ]; then
|
|
fi # UPLOAD
|
|
|
|
#Test that wget is installed, and supports --post-file. Upload $FILE if it does, and prompt user to upload file if it doesnt.
|
|
-if
|
|
-WGET=$(which wget 2>/dev/null| sed 's|^[^/]*||' 2>/dev/null); [[ -n "${WGET}" ]] && [[ -x "${WGET}" ]] && [[ `wget --help |grep post-file` ]]
|
|
+if [[ -n "${WGET}" ]] && [[ -x "${WGET}" ]] && [[ `wget --help |grep post-file` ]]
|
|
then
|
|
|
|
if [[ -n $DIALOG ]]
|
|
--
|
|
2.3.5
|
|
|