ship: split _punani_db off lib/punani

3 files changed, 42 insertions, 45 deletions

diff --git a/ship/build b/ship/build
index 61d79ee4..bd26482d 100755
--- a/ship/build
+++ b/ship/build
@@ -24,7 +24,7 @@ build() {
 ### macros
 ###
 
-## usage: #@include \([0-9A-Za-z]\+\) -> build_include \1 \2
+## usage: #@include \([0-9A-Za-z_]\+\) -> build_include \1 \2
 build_include() {
   if buildcache_has "#@include:$2"; then
     printf '%da\\\n##include %s: already done\n' $1 $2
diff --git a/ship/lib/_punani_db b/ship/lib/_punani_db
new file mode 100644
index 00000000..9812aff7
--- /dev/null
+++ b/ship/lib/_punani_db
@@ -0,0 +1,40 @@
+_punanidb_pacman_=
+_punanidb_yum_=
+_punanidb_aptget_=
+
+_punanidb_pacman_git=git
+_punanidb_yum_git=git
+_punanidb_aptget_git=git-core
+
+_punanidb_pacman_python2=python2
+_punanidb_yum_python2=python
+_punanidb_aptget_python2=python
+
+_punanidb_pacman_python3=python
+_punanidb_aptget_python3=python3
+
+_punanidb_pacman_hostname=inetutils
+_punanidb_aptget_hostname=hostname
+
+_punanidb_pacman_hostname=inetutils
+_punanidb_aptget_hostname=hostname
+
+_punanidb_pacman_make=make
+_punanidb_yum_make=make
+_punanidb_aptget_make=make
+
+_punanidb_pacman_tinc=tinc
+_punanidb_yum_tinc=tinc
+_punanidb_aptget_tinc=tinc
+
+_punanidb_pacman_tor=tor
+_punanidb_yum_tor=tor
+_punanidb_aptget_tor=tor
+
+_punanidb_pacman_nano=nano
+_punanidb_yum_nano=nano
+_punanidb_aptget_nano=nano
+
+_punanidb_pacman_vim=vim
+_punanidb_yum_vim=vim-enhanced
+_punanidb_aptget_vim=vim
diff --git a/ship/lib/punani b/ship/lib/punani
index c4f7f013..c07763a4 100644
--- a/ship/lib/punani
+++ b/ship/lib/punani
@@ -1,48 +1,5 @@
 #@include core
-
-## begin punani DB
-_punanidb_pacman_=
-_punanidb_yum_=
-_punanidb_aptget_=
-
-_punanidb_pacman_git=git
-_punanidb_yum_git=git
-_punanidb_aptget_git=git-core
-
-_punanidb_pacman_python2=python2
-_punanidb_yum_python2=python
-_punanidb_aptget_python2=python
-
-_punanidb_pacman_python3=python
-_punanidb_aptget_python3=python3
-
-_punanidb_pacman_hostname=inetutils
-_punanidb_aptget_hostname=hostname
-
-_punanidb_pacman_hostname=inetutils
-_punanidb_aptget_hostname=hostname
-
-_punanidb_pacman_make=make
-_punanidb_yum_make=make
-_punanidb_aptget_make=make
-
-_punanidb_pacman_tinc=tinc
-_punanidb_yum_tinc=tinc
-_punanidb_aptget_tinc=tinc
-
-_punanidb_pacman_tor=tor
-_punanidb_yum_tor=tor
-_punanidb_aptget_tor=tor
-
-_punanidb_pacman_nano=nano
-_punanidb_yum_nano=nano
-_punanidb_aptget_nano=nano
-
-_punanidb_pacman_vim=vim
-_punanidb_yum_vim=vim-enhanced
-_punanidb_aptget_vim=vim
-
-## end punani DB
+#@include _punani_db
 
 _punani_resolve_package(){
   : ${PACKER?PACKER is not set,bailing out}