[Xenomai] [PATCH] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Xenomai] [PATCH] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Henning Schild]

The environment variable TMPDIR is optional and not always set. We could
test for it and fall back to /tmp/ or just use the tool mktemp.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 scripts/prepare-kernel.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index 8e960e8..c9bb815 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -238,9 +238,9 @@ fi
 # Create an empty output patch file, and initialize the temporary tree.
 if test "x$output_patch" != "x"; then
 
-    temp_tree=$TMPDIR/prepare-kernel-$$
-    if ! mkdir $temp_tree; then
-	echo Temporary directory $temp_tree already exists, aborting.
+    temp_tree=$( mktemp -d prepare-kernel-XXX )
+    if [ $? -ne 0 ]; then
+	echo Temporary directory could not be created.
 	exit 1
     fi
 
-- 
2.4.10

[Xenomai] [PATCH v2] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Henning Schild]

The environment variable TMPDIR is optional and not always set. We could
test for it and fall back to /tmp/ or just use the tool mktemp.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 scripts/prepare-kernel.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index 8e960e8..c9bb815 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -238,9 +238,9 @@ fi
 # Create an empty output patch file, and initialize the temporary tree.
 if test "x$output_patch" != "x"; then
 
-    temp_tree=$TMPDIR/prepare-kernel-$$
-    if ! mkdir $temp_tree; then
-	echo Temporary directory $temp_tree already exists, aborting.
+    temp_tree=$( mktemp -d prepare-kernel-XXX )
+    if [ $? -ne 0 ]; then
+	echo Temporary directory could not be created.
 	exit 1
     fi
 
-- 
2.4.10

[Xenomai] [PATCH v3] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Henning Schild]

The environment variable TMPDIR is optional and not always set. We could
test for it and fall back to /tmp/ or just use the tool mktemp.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 scripts/prepare-kernel.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index 8e960e8..d7a2cc6 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -238,9 +238,9 @@ fi
 # Create an empty output patch file, and initialize the temporary tree.
 if test "x$output_patch" != "x"; then
 
-    temp_tree=$TMPDIR/prepare-kernel-$$
-    if ! mkdir $temp_tree; then
-	echo Temporary directory $temp_tree already exists, aborting.
+    temp_tree=$( mktemp -d prepare-kernel-XXX --tmpdir )
+    if [ $? -ne 0 ]; then
+	echo Temporary directory could not be created.
 	exit 1
     fi
 
-- 
2.4.10

Re: [Xenomai] [PATCH v3] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Henning Schild]

Sorry for the mess. The 3rd adds the --tmpdir switch, that is the diff
to the first two. The v2 is not different from v1 because i did not
ammend before sending the mail.

Henning

On Tue, 27 Oct 2015 13:30:50 +0100
Henning Schild <henning.schild@siemens.com> wrote:

> The environment variable TMPDIR is optional and not always set. We
> could test for it and fall back to /tmp/ or just use the tool mktemp.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  scripts/prepare-kernel.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
> index 8e960e8..d7a2cc6 100755
> --- a/scripts/prepare-kernel.sh
> +++ b/scripts/prepare-kernel.sh
> @@ -238,9 +238,9 @@ fi
>  # Create an empty output patch file, and initialize the temporary
> tree. if test "x$output_patch" != "x"; then
>  
> -    temp_tree=$TMPDIR/prepare-kernel-$$
> -    if ! mkdir $temp_tree; then
> -	echo Temporary directory $temp_tree already exists, aborting.
> +    temp_tree=$( mktemp -d prepare-kernel-XXX --tmpdir )
> +    if [ $? -ne 0 ]; then
> +	echo Temporary directory could not be created.
>  	exit 1
>      fi
>  

Re: [Xenomai] [PATCH] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Gilles Chanteperdrix]

On Tue, Oct 27, 2015 at 01:21:16PM +0100, Henning Schild wrote:
> The environment variable TMPDIR is optional and not always set. We could
> test for it and fall back to /tmp/ or just use the tool mktemp.

I am not sure mktemp is available everywhere. What about setting
TMPDIR to /tmp if not set ?

-- 
					    Gilles.
https://click-hack.org

Re: [Xenomai] [PATCH] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Henning Schild]

On Tue, 27 Oct 2015 13:30:04 +0100
Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> wrote:

> On Tue, Oct 27, 2015 at 01:21:16PM +0100, Henning Schild wrote:
> > The environment variable TMPDIR is optional and not always set. We
> > could test for it and fall back to /tmp/ or just use the tool
> > mktemp.
> 
> I am not sure mktemp is available everywhere. What about setting
> TMPDIR to /tmp if not set ?

From what i can tell mktemp is more widely available than TMPDIR. My
gentoo boxes do not have TMPDIR set and i have used a ubuntu system
where it was not set either. mktemp is part of coreutils and even
busybox has one.
I did not feel too good reimplementing whatever else mktemp does, why
reinvent the wheel?

Henning

Re: [Xenomai] [PATCH] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Henning Schild]

On Tue, 27 Oct 2015 13:35:40 +0100
Henning Schild <henning.schild@siemens.com> wrote:

> On Tue, 27 Oct 2015 13:30:04 +0100
> Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> wrote:
> 
> > On Tue, Oct 27, 2015 at 01:21:16PM +0100, Henning Schild wrote:
> > > The environment variable TMPDIR is optional and not always set. We
> > > could test for it and fall back to /tmp/ or just use the tool
> > > mktemp.
> > 
> > I am not sure mktemp is available everywhere. What about setting
> > TMPDIR to /tmp if not set ?
> 
> From what i can tell mktemp is more widely available than TMPDIR. My
> gentoo boxes do not have TMPDIR set and i have used a ubuntu system
> where it was not set either. mktemp is part of coreutils and even
> busybox has one.
> I did not feel too good reimplementing whatever else mktemp does, why
> reinvent the wheel?

Please let me know whether i was convincing and the current patch
version will be merged.

Henning 

> _______________________________________________
> Xenomai mailing list
> Xenomai@xenomai.org
> http://xenomai.org/mailman/listinfo/xenomai

Re: [Xenomai] [PATCH] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Gilles Chanteperdrix]

On Wed, Oct 28, 2015 at 09:33:13AM +0100, Henning Schild wrote:
> On Tue, 27 Oct 2015 13:35:40 +0100
> Henning Schild <henning.schild@siemens.com> wrote:
> 
> > On Tue, 27 Oct 2015 13:30:04 +0100
> > Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> wrote:
> > 
> > > On Tue, Oct 27, 2015 at 01:21:16PM +0100, Henning Schild wrote:
> > > > The environment variable TMPDIR is optional and not always set. We
> > > > could test for it and fall back to /tmp/ or just use the tool
> > > > mktemp.
> > > 
> > > I am not sure mktemp is available everywhere. What about setting
> > > TMPDIR to /tmp if not set ?
> > 
> > From what i can tell mktemp is more widely available than TMPDIR. My
> > gentoo boxes do not have TMPDIR set and i have used a ubuntu system
> > where it was not set either. mktemp is part of coreutils and even
> > busybox has one.
> > I did not feel too good reimplementing whatever else mktemp does, why
> > reinvent the wheel?
> 
> Please let me know whether i was convincing and the current patch
> version will be merged.

The patch is ok for me minus the use of $() which is used nowhere
else in the script and not strictly necessary (no nesting needed).

-- 
					    Gilles.
https://click-hack.org

[Xenomai] [PATCH v4] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Henning Schild]

The environment variable TMPDIR is optional and not always set. We could
test for it and fall back to /tmp/ or just use the tool mktemp.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 scripts/prepare-kernel.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index 8e960e8..333d11c 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -238,9 +238,9 @@ fi
 # Create an empty output patch file, and initialize the temporary tree.
 if test "x$output_patch" != "x"; then
 
-    temp_tree=$TMPDIR/prepare-kernel-$$
-    if ! mkdir $temp_tree; then
-	echo Temporary directory $temp_tree already exists, aborting.
+    temp_tree=`mktemp -d prepare-kernel-XXX --tmpdir`
+    if [ $? -ne 0 ]; then
+	echo Temporary directory could not be created.
 	exit 1
     fi
 
-- 
2.4.10

Re: [Xenomai] [PATCH v4] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Philippe Gerum]

On 10/28/2015 12:15 PM, Henning Schild wrote:
> The environment variable TMPDIR is optional and not always set. We could
> test for it and fall back to /tmp/ or just use the tool mktemp.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  scripts/prepare-kernel.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
> index 8e960e8..333d11c 100755
> --- a/scripts/prepare-kernel.sh
> +++ b/scripts/prepare-kernel.sh
> @@ -238,9 +238,9 @@ fi
>  # Create an empty output patch file, and initialize the temporary tree.
>  if test "x$output_patch" != "x"; then
>  
> -    temp_tree=$TMPDIR/prepare-kernel-$$
> -    if ! mkdir $temp_tree; then
> -	echo Temporary directory $temp_tree already exists, aborting.
> +    temp_tree=`mktemp -d prepare-kernel-XXX --tmpdir`
> +    if [ $? -ne 0 ]; then
> +	echo Temporary directory could not be created.
>  	exit 1
>      fi
>  
> 

merged, thanks.

-- 
Philippe.

Re: [Xenomai] [PATCH v4] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Gilles Chanteperdrix]

On Wed, Oct 28, 2015 at 12:15:16PM +0100, Henning Schild wrote:
> The environment variable TMPDIR is optional and not always set. We could
> test for it and fall back to /tmp/ or just use the tool mktemp.
> 
> Signed-off-by: Henning Schild <henning.schild@siemens.com>
> ---
>  scripts/prepare-kernel.sh | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
> index 8e960e8..333d11c 100755
> --- a/scripts/prepare-kernel.sh
> +++ b/scripts/prepare-kernel.sh
> @@ -238,9 +238,9 @@ fi
>  # Create an empty output patch file, and initialize the temporary tree.
>  if test "x$output_patch" != "x"; then
>  
> -    temp_tree=$TMPDIR/prepare-kernel-$$
> -    if ! mkdir $temp_tree; then
> -	echo Temporary directory $temp_tree already exists, aborting.
> +    temp_tree=`mktemp -d prepare-kernel-XXX --tmpdir`
> +    if [ $? -ne 0 ]; then
> +	echo Temporary directory could not be created.
>  	exit 1
>      fi

The version of mktemp installed on my machine requires 6 X in the
template.

-- 
					    Gilles.
https://click-hack.org

Re: [Xenomai] [PATCH v4] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Henning Schild]

On Wed, 4 Nov 2015 08:53:11 +0100
Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> wrote:

> On Wed, Oct 28, 2015 at 12:15:16PM +0100, Henning Schild wrote:
> > The environment variable TMPDIR is optional and not always set. We
> > could test for it and fall back to /tmp/ or just use the tool
> > mktemp.
> > 
> > Signed-off-by: Henning Schild <henning.schild@siemens.com>
> > ---
> >  scripts/prepare-kernel.sh | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
> > index 8e960e8..333d11c 100755
> > --- a/scripts/prepare-kernel.sh
> > +++ b/scripts/prepare-kernel.sh
> > @@ -238,9 +238,9 @@ fi
> >  # Create an empty output patch file, and initialize the temporary
> > tree. if test "x$output_patch" != "x"; then
> >  
> > -    temp_tree=$TMPDIR/prepare-kernel-$$
> > -    if ! mkdir $temp_tree; then
> > -	echo Temporary directory $temp_tree already exists,
> > aborting.
> > +    temp_tree=`mktemp -d prepare-kernel-XXX --tmpdir`
> > +    if [ $? -ne 0 ]; then
> > +	echo Temporary directory could not be created.
> >  	exit 1
> >      fi
> 
> The version of mktemp installed on my machine requires 6 X in the
> template.

That is unfortunate but easy enough to fix. The patch has already been
applied, so we will need another one on top. I suggest you go ahead and
expand the template since you found the problem.
The man-pages on my boxes all say "at least 3".

Henning

Re: [Xenomai] [PATCH v4] scripts: use mktemp instead of relying on TMPDIR beeing in env

[Gilles Chanteperdrix]

On Thu, Nov 05, 2015 at 11:31:28AM +0100, Henning Schild wrote:
> On Wed, 4 Nov 2015 08:53:11 +0100
> Gilles Chanteperdrix <gilles.chanteperdrix@xenomai.org> wrote:
> 
> > On Wed, Oct 28, 2015 at 12:15:16PM +0100, Henning Schild wrote:
> > > The environment variable TMPDIR is optional and not always set. We
> > > could test for it and fall back to /tmp/ or just use the tool
> > > mktemp.
> > > 
> > > Signed-off-by: Henning Schild <henning.schild@siemens.com>
> > > ---
> > >  scripts/prepare-kernel.sh | 6 +++---
> > >  1 file changed, 3 insertions(+), 3 deletions(-)
> > > 
> > > diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
> > > index 8e960e8..333d11c 100755
> > > --- a/scripts/prepare-kernel.sh
> > > +++ b/scripts/prepare-kernel.sh
> > > @@ -238,9 +238,9 @@ fi
> > >  # Create an empty output patch file, and initialize the temporary
> > > tree. if test "x$output_patch" != "x"; then
> > >  
> > > -    temp_tree=$TMPDIR/prepare-kernel-$$
> > > -    if ! mkdir $temp_tree; then
> > > -	echo Temporary directory $temp_tree already exists,
> > > aborting.
> > > +    temp_tree=`mktemp -d prepare-kernel-XXX --tmpdir`
> > > +    if [ $? -ne 0 ]; then
> > > +	echo Temporary directory could not be created.
> > >  	exit 1
> > >      fi
> > 
> > The version of mktemp installed on my machine requires 6 X in the
> > template.
> 
> That is unfortunate but easy enough to fix. The patch has already been
> applied, so we will need another one on top. I suggest you go ahead and
> expand the template since you found the problem.
> The man-pages on my boxes all say "at least 3".

I suggest your fix it.

-- 
					    Gilles.
https://click-hack.org

[Xenomai] [PATCH] scripts: increase number of Xs in mktemp template

[Henning Schild]

In a5cfe9c9a8dbcc094b0c5043b21fa6cde7fc42e5 the use of mktemp was
introduces. Some versions of mktemp seem to require a template of at
least 6 Xs.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 scripts/prepare-kernel.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index 333d11c..b75acf9 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -238,7 +238,7 @@ fi
 # Create an empty output patch file, and initialize the temporary tree.
 if test "x$output_patch" != "x"; then
 
-    temp_tree=`mktemp -d prepare-kernel-XXX --tmpdir`
+    temp_tree=`mktemp -d prepare-kernel-XXXXXX --tmpdir`
     if [ $? -ne 0 ]; then
 	echo Temporary directory could not be created.
 	exit 1
-- 
2.4.10

Re: [Xenomai] [PATCH] scripts: increase number of Xs in mktemp template

[Gilles Chanteperdrix]

On Thu, Nov 05, 2015 at 07:22:32PM +0100, Henning Schild wrote:
> In a5cfe9c9a8dbcc094b0c5043b21fa6cde7fc42e5 the use of mktemp was
> introduces. Some versions of mktemp seem to require a template of at
> least 6 Xs.

not at least. Exactly 6 Xs. And this requirement is actually part of
the POSIX standard:
http://pubs.opengroup.org/onlinepubs/9699919799/functions/mkstemp.html

-- 
					    Gilles.
https://click-hack.org

[Xenomai] [PATCHv2] scripts: increase number of Xs in mktemp template

[Henning Schild]

In a5cfe9c9a8dbcc094b0c5043b21fa6cde7fc42e5 the use of mktemp was
introduces. There are version of mktemp that are ok with less than six
Xs, but POSIX requires exactly six.
http://pubs.opengroup.org/onlinepubs/9699919799/functions/mkstemp.html

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 scripts/prepare-kernel.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/prepare-kernel.sh b/scripts/prepare-kernel.sh
index 333d11c..b75acf9 100755
--- a/scripts/prepare-kernel.sh
+++ b/scripts/prepare-kernel.sh
@@ -238,7 +238,7 @@ fi
 # Create an empty output patch file, and initialize the temporary tree.
 if test "x$output_patch" != "x"; then
 
-    temp_tree=`mktemp -d prepare-kernel-XXX --tmpdir`
+    temp_tree=`mktemp -d prepare-kernel-XXXXXX --tmpdir`
     if [ $? -ne 0 ]; then
 	echo Temporary directory could not be created.
 	exit 1
-- 
2.4.10