diff mbox

[OpenWrt-Devel] scripts: fix ubinize-image on OS X

Message ID 1425569489-7009-1-git-send-email-noltari@gmail.com
State Changes Requested, archived
Delegated to: Felix Fietkau
Headers show

Commit Message

Álvaro Fernández Rojas March 5, 2015, 3:31 p.m. UTC
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
---
 scripts/ubinize-image.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

John Crispin March 6, 2015, 7:14 a.m. UTC | #1
Hi Álvaro,

On 05/03/2015 16:31, Álvaro Fernández Rojas wrote:
> Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> --- 
> scripts/ubinize-image.sh | 3 +-- 1 file changed, 1 insertion(+), 2
> deletions(-)
> 
> diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh 
> index 6762c22..4fbbbfa 100755 --- a/scripts/ubinize-image.sh +++
> b/scripts/ubinize-image.sh @@ -98,7 +98,7 @@ if [ ! -x "$ubinize"
> ]; then exit 1 fi
> 
> -ubinizecfg="$( mktemp )" +ubinizecfg="$( mktemp 2> /dev/null ||
> mktemp -t 'ubitmp' )"

i think the next person wont know the purpose of this patch. how about

ubinizecfg="$( mktemp 2> /dev/null )"
[ -z "$ubinizecfg" ] && {
	# try OSX siganture
	ubinizecfg="$( mktemp -t 'ubitmp' )"
}

little bit of extra code but understandable in 1-2 years time

	John
diff mbox

Patch

diff --git a/scripts/ubinize-image.sh b/scripts/ubinize-image.sh
index 6762c22..4fbbbfa 100755
--- a/scripts/ubinize-image.sh
+++ b/scripts/ubinize-image.sh
@@ -98,7 +98,7 @@  if [ ! -x "$ubinize" ]; then
 	exit 1
 fi
 
-ubinizecfg="$( mktemp )"
+ubinizecfg="$( mktemp 2> /dev/null || mktemp -t 'ubitmp' )"
 ubilayout "$ubootenv" "$rootfs" "$kernel" > "$ubinizecfg"
 
 cat "$ubinizecfg"
@@ -108,4 +108,3 @@  err="$?"
 rm "$ubinizecfg"
 
 exit $err
-