From 38798b91ca31c81d8a529ad9fb91c167b3ffd823 Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Wed, 25 Oct 2017 17:20:56 +0100 Subject: [PATCH] share/db/update.sh --- share/db/sys.sql | 12 ++++++------ share/db/update.sh | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/share/db/sys.sql b/share/db/sys.sql index 0eb1e835..39c0f99a 100644 --- a/share/db/sys.sql +++ b/share/db/sys.sql @@ -1,9 +1,9 @@ ---DROP TABLE IF EXISTS service; -CREATE TABLE IF NOT EXISTS service ( - name VARCHAR(100), - description VARCHAR(200), - PRIMARY KEY (port,name) -); +DROP TABLE IF EXISTS service; +-- NB 25.10.17 CREATE TABLE IF NOT EXISTS service ( +-- NB 25.10.17 name VARCHAR(100), +-- NB 25.10.17 description VARCHAR(200), +-- NB 25.10.17 PRIMARY KEY (port,name) +-- NB 25.10.17 ); --DROP TABLE IF EXISTS service_port; DROP TABLE IF EXISTS service_port; diff --git a/share/db/update.sh b/share/db/update.sh index 98eaf46a..cec39f30 100755 --- a/share/db/update.sh +++ b/share/db/update.sh @@ -37,10 +37,10 @@ EOF data_src() { #pwd - perl -ne 'm,^(\w+)\s+\d+/\w+\s+#\s*(.*?)$, and $_=join(qq|\t|,map(/^\s*(.*?)\s*$/,$1,$2)).qq|\n| and !$h{$_}++ and print' \ - /etc/services \ - > "$tmp/service.csv" - csv2table service "$tmp/service.csv" +# NB 25.10.17 perl -ne 'm,^(\w+)\s+\d+/\w+\s+#\s*(.*?)$, and $_=join(qq|\t|,map(/^\s*(.*?)\s*$/,$1,$2)).qq|\n| and !$h{$_}++ and print' \ +# NB 25.10.17 /etc/services \ +# NB 25.10.17 > "$tmp/service.csv" +# NB 25.10.17 csv2table service "$tmp/service.csv" perl -ne 'm,^(\w+)\s+(\d+)/(\w+)\s+#\s*(.*?)$, and print join(qq|\t|,map(/^\s*(.*?)\s*$/,$2,$3,$1)).qq|\n|' \ /etc/services \ -- 2.47.3