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

Conflicts:
	.gitmodules

4 files changed, 17 insertions, 2 deletions

diff --git a/cholerab/cockbook/git/remove-submodule b/cholerab/cockbook/git/remove-submodule
new file mode 100644
index 00000000..da8a1b00
--- /dev/null
+++ b/cholerab/cockbook/git/remove-submodule
@@ -0,0 +1,5 @@
+Delete the relevant line from the .gitmodules file.
+Delete the relevant section from .git/config.
+Run git rm --cached path_to_submodule (no trailing slash).
+Commit and delete the now untracked submodule files.
+
diff --git a/cholerab/knut/clients/cnot/index b/cholerab/knut/clients/cnot/index
index f276dd25..fcbef73e 100755
--- a/cholerab/knut/clients/cnot/index
+++ b/cholerab/knut/clients/cnot/index
@@ -11,7 +11,7 @@ port=42101
 
 params="$*"
 
-flags=-sS
+flags=${curl_flags--fsS}
 
 if test "${verbose-no}" != no; then
   flags="${flags+$flags }-v"
diff --git a/cholerab/knut/index.js b/cholerab/knut/index.js
index 9c536006..b8951f1d 100755
--- a/cholerab/knut/index.js
+++ b/cholerab/knut/index.js
@@ -12,6 +12,16 @@ var spawn = require('child_process').spawn;
 
 var plugs = process.argv.slice(2);
 
+if (plugs.length === 0) {
+  console.error('Error 1: You are made of stupid!'
+      + '\nPro-Tip: '
+      + require('path').basename(process.argv[1]) + ' PLUG'
+      + ' # PLUG ∈ {'
+      + require('fs').readdirSync(__dirname + '/plugs').join(',')
+      + '}^n, n ≥ 1');
+  process.exit(23);
+};
+
 http.createServer(function (req, res) {
   return slurp(req, function (data) {
     try {
diff --git a/cholerab/shirts/bestellliste b/cholerab/shirts/bestellliste
index f775514e..f1f423e1 100644
--- a/cholerab/shirts/bestellliste
+++ b/cholerab/shirts/bestellliste
@@ -1,5 +1,5 @@
           # S G∃  Feedback
-tv        2 M j-
+tv        2 M jj  Superdick aufgetragenes Gummifetisch Logo; Farbe: genial
           1 S j-
 ulrich    1 M ?j  gut
 felix     2 M jj  super qualitaet, sogar nach dem waschen kein bisschen ausgebleicht