Merge branch 'master' of ssh://github.com/krebscode/painload

Conflicts:
	Cancer/crypto/bin/ukrepl
	crypto/bin/ukrepl
	util/bin/ukrepl

3 files changed, 13 insertions, 0 deletions

diff --git a/crypto/git/git-eternal-move b/Cancer/crypto/git/git-eternal-move
index 50361e7b..50361e7b 100755
--- a/crypto/git/git-eternal-move
+++ b/Cancer/crypto/git/git-eternal-move
diff --git a/ship/build b/ship/build
index f7dcf3c2..3f96cfe1 100755
--- a/ship/build
+++ b/ship/build
@@ -59,6 +59,18 @@ $1a\\
 EOF
 }
 
+## usage: #@mainifyme\( \([A-Za-z_][A-Za-z0-9_]*\)\)\? -> build_mainifyme \1 \3
+build_mainifyme() {
+  mainifyme_name="${2:-main}"
+  cat<<EOF
+  $1a\\
+$mainifyme_name(){
+  \$a\\
+}\\
+$mainifyme_name "\$@"
+EOF
+}
+
 ###
 ### main subroutines
 ###
diff --git a/ship/src/remaster_arch_iso b/ship/src/remaster_arch_iso
index cb090bbd..94a750c1 100755
--- a/ship/src/remaster_arch_iso
+++ b/ship/src/remaster_arch_iso
@@ -1,5 +1,6 @@
 #!/bin/sh
 #@include core
+#@mainifyme
 
 ## TODO: provide a parameter which defines what to be done in the new iso root
 set -efu