From 4116c55d265db83132da08ec870f53801a7247a6 Mon Sep 17 00:00:00 2001 From: P. J. McDermott Date: Sun, 06 Dec 2015 22:57:17 -0500 Subject: lib/*.sh: Drop include guards --- diff --git a/lib/archplat.sh b/lib/archplat.sh index d7b1424..b8324a0 100644 --- a/lib/archplat.sh +++ b/lib/archplat.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_ARCHPLAT_SM+set}" = 'xset' ] && return 0 -_ARCHPLAT_SM=1 - match_arch() { local arch="${1}" diff --git a/lib/block.sh b/lib/block.sh index ef1eed9..7021eda 100644 --- a/lib/block.sh +++ b/lib/block.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_BLOCK_SM+set}" = 'xset' ] && return 0 -_BLOCK_SM=1 - use rand use vardata diff --git a/lib/cmd.sh b/lib/cmd.sh index ecedb37..0c382dc 100644 --- a/lib/cmd.sh +++ b/lib/cmd.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_CMD_SM+set}" = 'xset' ] && return 0 -_CMD_SM=1 - use output use locale diff --git a/lib/control.sh b/lib/control.sh index 3dcb06c..14ec928 100644 --- a/lib/control.sh +++ b/lib/control.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_CONTROL_SM+set}" = 'xset' ] && return 0 -_CONTROL_SM=1 - use output use locale diff --git a/lib/deps.sh b/lib/deps.sh index 7800cad..2c759ba 100644 --- a/lib/deps.sh +++ b/lib/deps.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_DEPS_SM+set}" = 'xset' ] && return 0 -_DEPS_SM=1 - use archplat parse_dep() diff --git a/lib/dir.sh b/lib/dir.sh index c49469d..338d8fe 100644 --- a/lib/dir.sh +++ b/lib/dir.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_DIR_SM+set}" = 'xset' ] && return 0 -_DIR_SM=1 - dir_is_empty() { local dir="${1}" diff --git a/lib/fd.sh b/lib/fd.sh index 49ffc68..7debcad 100644 --- a/lib/fd.sh +++ b/lib/fd.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_FD_SM+set}" = 'xset' ] && return 0 -_FD_SM=1 - use output use locale diff --git a/lib/feed.sh b/lib/feed.sh index 8d29640..39ecca4 100644 --- a/lib/feed.sh +++ b/lib/feed.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_FEED_SM+set}" = 'xset' ] && return 0 -_FEED_SM=1 - use fd use control diff --git a/lib/getopt.sh b/lib/getopt.sh index b8d90fb..07769e7 100644 --- a/lib/getopt.sh +++ b/lib/getopt.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_GETOPT_SM+set}" = 'xset' ] && return 0 -_GETOPT_SM=1 - get_options() { local optstring= diff --git a/lib/install.sh b/lib/install.sh index b7ca485..fbe54a9 100644 --- a/lib/install.sh +++ b/lib/install.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_INSTALL_SM+set}" = 'xset' ] && return 0 -_INSTALL_SM=1 - use profile use dir use fd diff --git a/lib/locale.sh b/lib/locale.sh index 59390f8..3398e58 100644 --- a/lib/locale.sh +++ b/lib/locale.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_LOCALE_SM+set}" = 'xset' ] && return 0 -_LOCALE_SM=1 - LOCALEDIR='@localedir@' DEFAULT_LOCALE='en_US' TEXT_DOMAIN='@textdomain@' diff --git a/lib/mutex.sh b/lib/mutex.sh index fb96e66..cd4a365 100644 --- a/lib/mutex.sh +++ b/lib/mutex.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_MUTEX_SM+set}" = 'xset' ] && return 0 -_MUTEX_SM=1 - mutex_trylock() { local mutex="${1}" diff --git a/lib/opkg.sh b/lib/opkg.sh index 2b942d3..59a1a19 100644 --- a/lib/opkg.sh +++ b/lib/opkg.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_OPKG_SM+set}" = 'xset' ] && return 0 -_OPKG_SM=1 - use session opkg_install_all() diff --git a/lib/output.sh b/lib/output.sh index 877c7fc..62d2095 100644 --- a/lib/output.sh +++ b/lib/output.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_OUTPUT_SM+set}" = 'xset' ] && return 0 -_OUTPUT_SM=1 - error() { local status=${1} diff --git a/lib/package.sh b/lib/package.sh index 5c494ba..20c99ab 100644 --- a/lib/package.sh +++ b/lib/package.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_PACKAGE_SM+set}" = 'xset' ] && return 0 -_PACKAGE_SM=1 - use locale use output diff --git a/lib/pkg.sh b/lib/pkg.sh index 337a864..ee4aa25 100644 --- a/lib/pkg.sh +++ b/lib/pkg.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_PKG_SM+set}" = 'xset' ] && return 0 -_PKG_SM=1 - resolve_deps() { local new_pkgs="${1}" diff --git a/lib/profile.sh b/lib/profile.sh index 44c58a2..436dbdc 100644 --- a/lib/profile.sh +++ b/lib/profile.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_PROFILE_SM+set}" = 'xset' ] && return 0 -_PROFILE_SM=1 - use output use locale diff --git a/lib/rand.sh b/lib/rand.sh index 18d7749..b4b33fb 100644 --- a/lib/rand.sh +++ b/lib/rand.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_RAND_SM+set}" = 'xset' ] && return 0 -_RAND_SM=1 - use output use locale diff --git a/lib/session.sh b/lib/session.sh index 05fecc4..f94d8e6 100644 --- a/lib/session.sh +++ b/lib/session.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_SESSION_SM+set}" = 'xset' ] && return 0 -_SESSION_SM=1 - use rand use mutex use output diff --git a/lib/substvars.sh b/lib/substvars.sh index d69c693..c2bc3f8 100644 --- a/lib/substvars.sh +++ b/lib/substvars.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_SUBSTVARS_SM+set}" = 'xset' ] && return 0 -_SUBSTVARS_SM=1 - substvars_max_depth=50 set_substvar() diff --git a/lib/vardata.sh b/lib/vardata.sh index 8800003..13512e9 100644 --- a/lib/vardata.sh +++ b/lib/vardata.sh @@ -18,9 +18,6 @@ # along with the ProteanOS Development Kit. If not, see # . -[ "x${_VARDATA_SM+set}" = 'xset' ] && return 0 -_VARDATA_SM=1 - PKGLOCALSTATEDIR='@pkglocalstatedir@' VARDATA_DIRS='mount' -- cgit v0.9.1