Message ID | 1328888654-29460-1-git-send-email-colin.king@canonical.com |
---|---|
State | Accepted |
Headers | show |
On Fri, Feb 10, 2012 at 11:44 PM, Colin King <colin.king@canonical.com> wrote: > From: Colin Ian King <colin.king@canonical.com> > > Signed-off-by: Colin Ian King <colin.king@canonical.com> > --- > scripts/fwts-collect | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/scripts/fwts-collect b/scripts/fwts-collect > index f8bd12c..37e0042 100755 > --- a/scripts/fwts-collect > +++ b/scripts/fwts-collect > @@ -116,8 +116,8 @@ trap 'on_die' TERM INT > mkdir $TMPDIR > > err=$? > -if [ $? -ne 0 ]; then > - echo "Cannot create temporary directory $TMPDIR: error $?" 1>&2 > +if [ $err -ne 0 ]; then > + echo "Cannot create temporary directory $TMPDIR: error $err" 1>&2 > exit 1 > fi > > -- > 1.7.9 > Acked-by: Keng-Yu Lin <kengyu@canonical.com>
On 02/20/2012 10:23 PM, Keng-Yü Lin wrote: > On Fri, Feb 10, 2012 at 11:44 PM, Colin King<colin.king@canonical.com> wrote: >> From: Colin Ian King<colin.king@canonical.com> >> >> Signed-off-by: Colin Ian King<colin.king@canonical.com> >> --- >> scripts/fwts-collect | 4 ++-- >> 1 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/scripts/fwts-collect b/scripts/fwts-collect >> index f8bd12c..37e0042 100755 >> --- a/scripts/fwts-collect >> +++ b/scripts/fwts-collect >> @@ -116,8 +116,8 @@ trap 'on_die' TERM INT >> mkdir $TMPDIR >> >> err=$? >> -if [ $? -ne 0 ]; then >> - echo "Cannot create temporary directory $TMPDIR: error $?" 1>&2 >> +if [ $err -ne 0 ]; then >> + echo "Cannot create temporary directory $TMPDIR: error $err" 1>&2 >> exit 1 >> fi >> >> -- >> 1.7.9 >> > Acked-by: Keng-Yu Lin<kengyu@canonical.com> This was used in the fwts-live images last week at Plugfest and fwts-collect works as expected: Acked-by: Chris Van Hoof <vanhoof@canonical.com>
diff --git a/scripts/fwts-collect b/scripts/fwts-collect index f8bd12c..37e0042 100755 --- a/scripts/fwts-collect +++ b/scripts/fwts-collect @@ -116,8 +116,8 @@ trap 'on_die' TERM INT mkdir $TMPDIR err=$? -if [ $? -ne 0 ]; then - echo "Cannot create temporary directory $TMPDIR: error $?" 1>&2 +if [ $err -ne 0 ]; then + echo "Cannot create temporary directory $TMPDIR: error $err" 1>&2 exit 1 fi