diff options
| author | epoch <epoch@hacking.allowed.org> | 2013-05-24 02:39:47 +0000 |
|---|---|---|
| committer | epoch <epoch@hacking.allowed.org> | 2013-05-24 02:39:47 +0000 |
| commit | 59c1751062b903e3e009afd6ec0effb3bf29f1c0 (patch) | |
| tree | 5cdca1832eefcedd01c560264a2f2dabc855e0b9 | |
| parent | b09ebf67a7b0036f2f0f539ec6ee95d02d4c0cba (diff) | |
| parent | a1eca4f2b495baa4f98e228e393a17f06ad3e95b (diff) | |
| download | resdb-59c1751062b903e3e009afd6ec0effb3bf29f1c0.tar.gz resdb-59c1751062b903e3e009afd6ec0effb3bf29f1c0.zip | |
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
| -rw-r--r-- | db/dom/ano/drugs/ns/a.ns.drugs.ano | 1 | ||||
| -rw-r--r-- | db/dom/ano/drugs/owner | 1 | ||||
| -rw-r--r-- | db/dom/drugs/pcp/ns/a.ns.pcp.drugs | 1 | ||||
| -rw-r--r-- | db/dom/drugs/pcp/owner | 1 | ||||
| -rwxr-xr-x | scripts/add_dom | 2 |
5 files changed, 5 insertions, 1 deletions
diff --git a/db/dom/ano/drugs/ns/a.ns.drugs.ano b/db/dom/ano/drugs/ns/a.ns.drugs.ano new file mode 100644 index 0000000..ad31a96 --- /dev/null +++ b/db/dom/ano/drugs/ns/a.ns.drugs.ano @@ -0,0 +1 @@ +1.79.3.153 diff --git a/db/dom/ano/drugs/owner b/db/dom/ano/drugs/owner new file mode 100644 index 0000000..91f6164 --- /dev/null +++ b/db/dom/ano/drugs/owner @@ -0,0 +1 @@ +somebody diff --git a/db/dom/drugs/pcp/ns/a.ns.pcp.drugs b/db/dom/drugs/pcp/ns/a.ns.pcp.drugs new file mode 100644 index 0000000..ad31a96 --- /dev/null +++ b/db/dom/drugs/pcp/ns/a.ns.pcp.drugs @@ -0,0 +1 @@ +1.79.3.153 diff --git a/db/dom/drugs/pcp/owner b/db/dom/drugs/pcp/owner new file mode 100644 index 0000000..91f6164 --- /dev/null +++ b/db/dom/drugs/pcp/owner @@ -0,0 +1 @@ +somebody diff --git a/scripts/add_dom b/scripts/add_dom index 013ce18..b60a964 100755 --- a/scripts/add_dom +++ b/scripts/add_dom @@ -5,7 +5,7 @@ if [ x"$2" = x ]; then 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; |