Mercurial > hg > anonet-resdb
changeset 1119:5645d1ed79c5 draft
There was some werid stuff with add_dom went with what looked like the best
of the conflicting lines.
Merge branch 'master' of git://1.4.7.7/resdb
Conflicts:
scripts/add_dom
| author | epoch <epoch@hacking.allowed.org> |
|---|---|
| date | Fri, 24 May 2013 02:39:47 +0000 |
| parents | c6666d29e9c6 (current diff) 98f2113fb0c1 (diff) |
| children | 8e01b8361e9e |
| files | scripts/add_dom |
| diffstat | 5 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/drugs/ns/a.ns.drugs.ano Fri May 24 02:39:47 2013 +0000 @@ -0,0 +1,1 @@ +1.79.3.153
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/ano/drugs/owner Fri May 24 02:39:47 2013 +0000 @@ -0,0 +1,1 @@ +somebody
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/drugs/pcp/ns/a.ns.pcp.drugs Fri May 24 02:39:47 2013 +0000 @@ -0,0 +1,1 @@ +1.79.3.153
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/db/dom/drugs/pcp/owner Fri May 24 02:39:47 2013 +0000 @@ -0,0 +1,1 @@ +somebody
--- a/scripts/add_dom Sun May 12 09:46:28 2013 +0000 +++ b/scripts/add_dom Fri May 24 02:39:47 2013 +0000 @@ -5,7 +5,7 @@ fi dir=db/dom/"$(echo "$1" | tr . '\n' | tac | tr '\n' / | ./scripts/head_-c_-1)" -mkdir "$dir" || exit 1 +mkdir -p "$dir" || exit 1 echo "$2" > "$dir/owner" mkdir "$dir/ns" || exit 1 shift; shift;