From 9fedf314cfd84f9b77629b42acd0586fc98f8be2 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Mon, 31 Oct 2011 11:09:42 +0100 Subject: [PATCH 1/5] add explorers for lsb_* Signed-off-by: Steven Armstrong --- conf/explorer/lsb_codename | 24 ++++++++++++++++++++++++ conf/explorer/lsb_description | 24 ++++++++++++++++++++++++ conf/explorer/lsb_id | 24 ++++++++++++++++++++++++ conf/explorer/lsb_release | 24 ++++++++++++++++++++++++ 4 files changed, 96 insertions(+) create mode 100755 conf/explorer/lsb_codename create mode 100755 conf/explorer/lsb_description create mode 100755 conf/explorer/lsb_id create mode 100755 conf/explorer/lsb_release diff --git a/conf/explorer/lsb_codename b/conf/explorer/lsb_codename new file mode 100755 index 00000000..eec12710 --- /dev/null +++ b/conf/explorer/lsb_codename @@ -0,0 +1,24 @@ +#!/bin/sh +# +# 2011 Steven Armstrong (steven-cdist at armstrong.cc) +# +# This file is part of cdist. +# +# cdist is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# cdist is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with cdist. If not, see . +# +# + +lsb_release=$(which lsb_release) +[ -x $lsb_release ] && $lsb_release --short --codename \ +|| echo lsb not supported diff --git a/conf/explorer/lsb_description b/conf/explorer/lsb_description new file mode 100755 index 00000000..7349ddeb --- /dev/null +++ b/conf/explorer/lsb_description @@ -0,0 +1,24 @@ +#!/bin/sh +# +# 2011 Steven Armstrong (steven-cdist at armstrong.cc) +# +# This file is part of cdist. +# +# cdist is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# cdist is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with cdist. If not, see . +# +# + +lsb_release=$(which lsb_release) +[ -x $lsb_release ] && $lsb_release --short --description \ +|| echo lsb not supported diff --git a/conf/explorer/lsb_id b/conf/explorer/lsb_id new file mode 100755 index 00000000..eac173cd --- /dev/null +++ b/conf/explorer/lsb_id @@ -0,0 +1,24 @@ +#!/bin/sh +# +# 2011 Steven Armstrong (steven-cdist at armstrong.cc) +# +# This file is part of cdist. +# +# cdist is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# cdist is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with cdist. If not, see . +# +# + +lsb_release=$(which lsb_release) +[ -x $lsb_release ] && $lsb_release --short --id \ +|| echo lsb not supported diff --git a/conf/explorer/lsb_release b/conf/explorer/lsb_release new file mode 100755 index 00000000..b3ac4093 --- /dev/null +++ b/conf/explorer/lsb_release @@ -0,0 +1,24 @@ +#!/bin/sh +# +# 2011 Steven Armstrong (steven-cdist at armstrong.cc) +# +# This file is part of cdist. +# +# cdist is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# cdist is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with cdist. If not, see . +# +# + +lsb_release=$(which lsb_release) +[ -x $lsb_release ] && $lsb_release --short --release \ +|| echo lsb not supported From de84542579d410ef268941f26a4be993c0cbc59f Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Mon, 31 Oct 2011 14:36:58 +0100 Subject: [PATCH 2/5] no lsb_release -> no output Signed-off-by: Steven Armstrong --- conf/explorer/lsb_codename | 3 +-- conf/explorer/lsb_description | 3 +-- conf/explorer/lsb_id | 3 +-- conf/explorer/lsb_release | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/conf/explorer/lsb_codename b/conf/explorer/lsb_codename index eec12710..a8cb2cc4 100755 --- a/conf/explorer/lsb_codename +++ b/conf/explorer/lsb_codename @@ -20,5 +20,4 @@ # lsb_release=$(which lsb_release) -[ -x $lsb_release ] && $lsb_release --short --codename \ -|| echo lsb not supported +[ -x $lsb_release ] && $lsb_release --short --codename diff --git a/conf/explorer/lsb_description b/conf/explorer/lsb_description index 7349ddeb..da0dd74d 100755 --- a/conf/explorer/lsb_description +++ b/conf/explorer/lsb_description @@ -20,5 +20,4 @@ # lsb_release=$(which lsb_release) -[ -x $lsb_release ] && $lsb_release --short --description \ -|| echo lsb not supported +[ -x $lsb_release ] && $lsb_release --short --description diff --git a/conf/explorer/lsb_id b/conf/explorer/lsb_id index eac173cd..44eb7eaa 100755 --- a/conf/explorer/lsb_id +++ b/conf/explorer/lsb_id @@ -20,5 +20,4 @@ # lsb_release=$(which lsb_release) -[ -x $lsb_release ] && $lsb_release --short --id \ -|| echo lsb not supported +[ -x $lsb_release ] && $lsb_release --short --id diff --git a/conf/explorer/lsb_release b/conf/explorer/lsb_release index b3ac4093..6e0d3a8a 100755 --- a/conf/explorer/lsb_release +++ b/conf/explorer/lsb_release @@ -20,5 +20,4 @@ # lsb_release=$(which lsb_release) -[ -x $lsb_release ] && $lsb_release --short --release \ -|| echo lsb not supported +[ -x $lsb_release ] && $lsb_release --short --release From d4aa04f35d6745fd48852c381057dcee2a93d419 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Mon, 31 Oct 2011 16:16:10 +0100 Subject: [PATCH 3/5] dont fail if lsb_release does not exist Signed-off-by: Steven Armstrong --- conf/explorer/lsb_codename | 6 ++++-- conf/explorer/lsb_description | 6 ++++-- conf/explorer/lsb_id | 6 ++++-- conf/explorer/lsb_release | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/conf/explorer/lsb_codename b/conf/explorer/lsb_codename index a8cb2cc4..08bf75be 100755 --- a/conf/explorer/lsb_codename +++ b/conf/explorer/lsb_codename @@ -19,5 +19,7 @@ # # -lsb_release=$(which lsb_release) -[ -x $lsb_release ] && $lsb_release --short --codename +lsb_release=$(which lsb_release 2>/dev/null) +if [ -x "$lsb_release" ]; then + $lsb_release --short --codename +fi diff --git a/conf/explorer/lsb_description b/conf/explorer/lsb_description index da0dd74d..14e59e76 100755 --- a/conf/explorer/lsb_description +++ b/conf/explorer/lsb_description @@ -19,5 +19,7 @@ # # -lsb_release=$(which lsb_release) -[ -x $lsb_release ] && $lsb_release --short --description +lsb_release=$(which lsb_release 2>/dev/null) +if [ -x "$lsb_release" ]; then + $lsb_release --short --description +fi diff --git a/conf/explorer/lsb_id b/conf/explorer/lsb_id index 44eb7eaa..10d6ce52 100755 --- a/conf/explorer/lsb_id +++ b/conf/explorer/lsb_id @@ -19,5 +19,7 @@ # # -lsb_release=$(which lsb_release) -[ -x $lsb_release ] && $lsb_release --short --id +lsb_release=$(which lsb_release 2>/dev/null) +if [ -x "$lsb_release" ]; then + $lsb_release --short --id +fi diff --git a/conf/explorer/lsb_release b/conf/explorer/lsb_release index 6e0d3a8a..2139c2e6 100755 --- a/conf/explorer/lsb_release +++ b/conf/explorer/lsb_release @@ -19,5 +19,7 @@ # # -lsb_release=$(which lsb_release) -[ -x $lsb_release ] && $lsb_release --short --release +lsb_release=$(which lsb_release 2>/dev/null) +if [ -x "$lsb_release" ]; then + $lsb_release --short --release +fi From 5ac857a87ce69f79aa260f7589cdf90829a560c8 Mon Sep 17 00:00:00 2001 From: Steven Armstrong Date: Mon, 31 Oct 2011 16:20:48 +0100 Subject: [PATCH 4/5] realy, dont fail if lsb_release does not exist Signed-off-by: Steven Armstrong --- conf/explorer/lsb_codename | 1 + conf/explorer/lsb_description | 1 + conf/explorer/lsb_id | 1 + conf/explorer/lsb_release | 1 + 4 files changed, 4 insertions(+) diff --git a/conf/explorer/lsb_codename b/conf/explorer/lsb_codename index 08bf75be..bc742cf7 100755 --- a/conf/explorer/lsb_codename +++ b/conf/explorer/lsb_codename @@ -19,6 +19,7 @@ # # +set +e lsb_release=$(which lsb_release 2>/dev/null) if [ -x "$lsb_release" ]; then $lsb_release --short --codename diff --git a/conf/explorer/lsb_description b/conf/explorer/lsb_description index 14e59e76..f6c30322 100755 --- a/conf/explorer/lsb_description +++ b/conf/explorer/lsb_description @@ -19,6 +19,7 @@ # # +set +e lsb_release=$(which lsb_release 2>/dev/null) if [ -x "$lsb_release" ]; then $lsb_release --short --description diff --git a/conf/explorer/lsb_id b/conf/explorer/lsb_id index 10d6ce52..6cb2359b 100755 --- a/conf/explorer/lsb_id +++ b/conf/explorer/lsb_id @@ -19,6 +19,7 @@ # # +set +e lsb_release=$(which lsb_release 2>/dev/null) if [ -x "$lsb_release" ]; then $lsb_release --short --id diff --git a/conf/explorer/lsb_release b/conf/explorer/lsb_release index 2139c2e6..5787b71f 100755 --- a/conf/explorer/lsb_release +++ b/conf/explorer/lsb_release @@ -19,6 +19,7 @@ # # +set +e lsb_release=$(which lsb_release 2>/dev/null) if [ -x "$lsb_release" ]; then $lsb_release --short --release From d6d4d374bd11136287e987c438d76bad74883fd5 Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Mon, 31 Oct 2011 18:26:36 +0100 Subject: [PATCH 5/5] remove unecessary whitespace :-) Signed-off-by: Nico Schottelius --- conf/explorer/lsb_release | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conf/explorer/lsb_release b/conf/explorer/lsb_release index 5787b71f..a96ac50b 100755 --- a/conf/explorer/lsb_release +++ b/conf/explorer/lsb_release @@ -23,4 +23,4 @@ set +e lsb_release=$(which lsb_release 2>/dev/null) if [ -x "$lsb_release" ]; then $lsb_release --short --release -fi +fi