lib/*.sh, lib/*/*.sh: Rewrite include guards.

This is one step toward adding `set -u` to opkbuild.

11 files changed, 22 insertions, 22 deletions

diff --git a/lib/changelog.sh b/lib/changelog.sh
index 9aaa0b9..692ee80 100644
--- a/lib/changelog.sh
+++ b/lib/changelog.sh
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -n "${_OB_CHANGELOG_SM}" ] && return 0
-_OB_CHANGELOG_SM='true'
+[ x"${_OB_CHANGELOG_SM+set}" = x'set' ] && return 0
+_OB_CHANGELOG_SM=1
 
 ob_use messages
 ob_use locale
diff --git a/lib/common.sh b/lib/common.sh
index 3fd3cc5..c2a0030 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -n "${_OB_COMMON_SM}" ] && return 0
-_OB_COMMON_SM='true'
+[ x"${_OB_COMMON_SM+set}" = x'set' ] && return 0
+_OB_COMMON_SM=1
 
 _ob_validate_var_name()
 {
diff --git a/lib/control.sh b/lib/control.sh
index f3f3a4f..b0576e0 100644
--- a/lib/control.sh
+++ b/lib/control.sh
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -n "${_OB_CONTROL_SM}" ] && return 0
-_OB_CONTROL_SM='true'
+[ x"${_OB_CONTROL_SM+set}" = x'set' ] && return 0
+_OB_CONTROL_SM=1
 
 ob_use messages
 ob_use locale
diff --git a/lib/deps.sh b/lib/deps.sh
index c33a6d9..9193bfc 100644
--- a/lib/deps.sh
+++ b/lib/deps.sh
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -n "${_OB_DEPS_SM}" ] && return 0
-_OB_DEPS_SM='true'
+[ x"${_OB_DEPS_SM+set}" = x'set' ] && return 0
+_OB_DEPS_SM=1
 
 ob_use metadata
 
diff --git a/lib/load.sh b/lib/load.sh
index 685f414..a061005 100644
--- a/lib/load.sh
+++ b/lib/load.sh
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -n "${_OB_LOAD_SM}" ] && return 0
-_OB_LOAD_SM='true'
+[ x"${_OB_LOAD_SM+set}" = x'set' ] && return 0
+_OB_LOAD_SM=1
 
 # The "common" module is used by this and all other modules.
 # We have to manually load the "common" module so we can use it in ob_use.
diff --git a/lib/locale.sh b/lib/locale.sh
index 4d519a3..7176b8e 100644
--- a/lib/locale.sh
+++ b/lib/locale.sh
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -n "${_OB_LOCALE_SM}" ] && return 0
-_OB_LOCALE_SM='true'
+[ x"${_OB_LOCALE_SM+set}" = x'set' ] && return 0
+_OB_LOCALE_SM=1
 
 ob_use output
 
diff --git a/lib/metadata.sh b/lib/metadata.sh
index e25abd5..63e9ea3 100644
--- a/lib/metadata.sh
+++ b/lib/metadata.sh
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -n "${_OB_METADATA_SM}" ] && return 0
-_OB_METADATA_SM='true'
+[ x"${_OB_METADATA_SM+set}" = x'set' ] && return 0
+_OB_METADATA_SM=1
 
 ob_use 'metadata/@@METADATA@@'
 
diff --git a/lib/metadata/proteanos.sh b/lib/metadata/proteanos.sh
index 493f30a..830b205 100644
--- a/lib/metadata/proteanos.sh
+++ b/lib/metadata/proteanos.sh
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -n "${_OB_METADATA_PROTEANOS_SM}" ] && return 0
-_OB_METADATA_PROTEANOS_SM='true'
+[ x"${_OB_METADATA_PROTEANOS_SM+set}" = x'set' ] && return 0
+_OB_METADATA_PROTEANOS_SM=1
 
 _OB_NAME_RE_PROTEANOS='^[a-z0-9][a-z0-9+.-]+$'
 _OB_VERSION_RE_PROTEANOS='^'
diff --git a/lib/output.sh b/lib/output.sh
index 5d60d3d..b718824 100644
--- a/lib/output.sh
+++ b/lib/output.sh
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -n "${_OB_MESSAGES_SH}" ] && return 0
-_OB_MESSAGES_SH=true
+[ x"${_OB_OUTPUT_SM+set}" = x'set' ] && return 0
+_OB_OUTPUT_SM=1
 
 ob_use locale
 
diff --git a/lib/package.sh b/lib/package.sh
index 4d040ab..c489f6c 100644
--- a/lib/package.sh
+++ b/lib/package.sh
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -n "${_OB_PACKAGE_SM}" ] && return 0
-_OB_PACKAGE_SM='true'
+[ x"${_OB_PACKAGE_SM+set}" = x'set' ] && return 0
+_OB_PACKAGE_SM=1
 
 ob_use metadata
 
diff --git a/lib/package/2.sh b/lib/package/2.sh
index 25c4865..4246307 100644
--- a/lib/package/2.sh
+++ b/lib/package/2.sh
@@ -17,8 +17,8 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-[ -n "${_OB_PACKAGE_2_SM}" ] && return 0
-_OB_PACKAGE_2_SM='true'
+[ x"${_OB_PACKAGE_2_SM+set}" = x'set' ] && return 0
+_OB_PACKAGE_2_SM=1
 
 ob_use control
 ob_use changelog