summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormakefu <github@syntax-fehler.de>2011-08-30 11:25:00 +0200
committermakefu <github@syntax-fehler.de>2011-08-30 11:25:00 +0200
commitbbf2bc45f02e8795b8cda6dde262226cd658bfd4 (patch)
tree4089d3fd6ac40c0d5a91dae46a444d4c62139a22
parentcd4f8b3394e02bcb7d86d53d1b98b4b4b868b78b (diff)
parentb1f0a73e5810aed4fd78aad2bb55a8a67f76df5d (diff)
Merge branch 'master' of github.com:krebscode/painload into punani_files
Conflicts: .gitmodules
-rw-r--r--.gitmodules3
-rw-r--r--cholerab/cockbook/git/remove-submodule5
-rwxr-xr-xcholerab/knut/clients/cnot/index2
-rwxr-xr-xcholerab/knut/index.js10
-rw-r--r--cholerab/shirts/bestellliste2
m---------krebsbeam/c-beam0
-rw-r--r--streams/stream.db1
-rwxr-xr-xutil/bin/hrefs20
8 files changed, 41 insertions, 2 deletions
diff --git a/.gitmodules b/.gitmodules
index 3677b710..cbc61522 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -13,6 +13,9 @@
[submodule "submodules/github/tautologistics/node-htmlparser"]
path = submodules/github/tautologistics/node-htmlparser
url = https://github.com/tautologistics/node-htmlparser
+[submodule "krebsbeam/c-beam"]
+ path = krebsbeam/c-beam
+ url = git://dev.c-base.org/c-beam/c-beam.git
[submodule "submodules/github/makefu/dpfhack_display"]
path = submodules/github/makefu/dpfhack_display
url = https://github.com/makefu/dpfhack_pearl
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
diff --git a/krebsbeam/c-beam b/krebsbeam/c-beam
new file mode 160000
+Subproject 0072bf8f0cd3a6d0fe022c15c8957373cebef29
diff --git a/streams/stream.db b/streams/stream.db
index 34acaa71..5efeb9ea 100644
--- a/streams/stream.db
+++ b/streams/stream.db
@@ -5,3 +5,4 @@ http://bassdrive.com/v2/streams/BassDrive.pls bassdrive
http://somafm.com/illstreet.pls illstreet
http://localhost:8000/stream.ogg icecast
http://stream2.jungletrain.net:8000 jungletrain
+http://playlist.tormentedradio.com/tormentedradio.pls tormented
diff --git a/util/bin/hrefs b/util/bin/hrefs
new file mode 100755
index 00000000..3a1a51de
--- /dev/null
+++ b/util/bin/hrefs
@@ -0,0 +1,20 @@
+#! /bin/sh
+
+_hrefs() {
+ sed -n 's/href="\([^"]\+\)"/\n&\n/gp' |
+ sed -n 's/^href="\([^"]\+\)"$/\1/p'; }
+
+_add_prefix_to_relative_hrefs() {
+ sed '/^http:/!s^'"$1"''; }
+
+_main() {
+ case $# in
+ (0) _hrefs;;
+ (1) _hrefs | _add_prefix_to_relative_hrefs "$1";;
+ (*)
+ echo "bad command line: $0 $*" >&2; exit 23;;
+ esac; }
+
+set -euf
+_main "$@"
+#### end of file.