Skip to content

Commit 07f9aeb

Browse files
ip2locationip2location
committed
Fixed import error.
1 parent b4d0d09 commit 07f9aeb

File tree

1 file changed

+48
-50
lines changed

1 file changed

+48
-50
lines changed

‎run.sh‎

Lines changed: 48 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ mkdir /_tmp
1717
cd /_tmp
1818

1919
echo -n ' > Download IP2Location package '
20-
wget -O database.zip -q --user-agent="Docker-IP2Location/PostgreSQL" http://www.ip2location.com/download?token=${TOKEN}\&productcode=${CODE} 2>&1
20+
wget -O database.zip -q --user-agent="Docker-IP2Location/PostgreSQL" http://www.ip2location.com/download?token=${TOKEN}\&productcode=${CODE}
2121

2222
[ ! -f database.zip ] && error '[ERROR]'
2323

@@ -27,20 +27,22 @@ wget -O database.zip -q --user-agent="Docker-IP2Location/PostgreSQL" http://www.
2727

2828
[ $(wc -c < database.zip) -lt 102400 ] && error '[ERROR]'
2929

30+
success '[OK]'
31+
3032
echo -n ' > Decompress downloaded package '
3133

3234
unzip -q -o database.zip
3335

34-
if [ "$CODE" == "DB1CSV" ]; then
36+
if [ "$CODE" == "DB1" ]; then
3537
CSV="$(find . -name 'IPCountry.csv')"
3638

37-
elif [ "$CODE" == "DB2CSV" ]; then
39+
elif [ "$CODE" == "DB2" ]; then
3840
CSV="$(find . -name 'IPISP.csv')"
3941

4042
elif [ ! -z "$(echo $CODE | grep 'LITE')" ]; then
4143
CSV="$(find . -name 'IP*.CSV')"
4244

43-
elif [ ! -z "$(echo $CODE | grep 'CSVIPV6')" ]; then
45+
elif [ ! -z "$(echo $CODE | grep 'IPV6')" ]; then
4446
CSV="$(find . -name 'IPV6-COUNTRY*.CSV')"
4547

4648
elif [ ! -z "$(echo $CODE | grep 'PX')" ]; then
@@ -50,14 +52,14 @@ else
5052
CSV="$(find . -name 'IP-COUNTRY*.CSV')"
5153
fi
5254

53-
if [ -z "$CSV" ]; then
55+
if [ -z "$" ]; then
5456
echo "=> Downloaded package is corrupted"
5557
exit 1
5658
fi
5759

58-
[ -z "$CSV" ] && error '[ERROR]' || success '[OK]'
60+
[ -z "$" ] && error '[ERROR]' || success '[OK]'
5961

60-
service postgresql start >/dev/null 2>&1
62+
service postgresql start >/dev/null
6163

6264
echo -n ' > [PostgreSQL] Create database "ip2location_database" '
6365

@@ -68,130 +70,130 @@ RESPONSE="$(sudo -u postgres createdb ip2location_database 2>&1)"
6870
echo -n ' > [PostgreSQL] Create table "ip2location_database_tmp" '
6971

7072
case "$CODE" in
71-
DB1CSV|DB1LITECSV|DB1CSVIPV6|DB1LITECSVIPV6 )
73+
DB1|DB1LITE|DB1IPV6|DB1LITEIPV6 )
7274
FIELDS=''
7375
;;
74-
DB2CSV|DB2CSVIPV6 )
76+
DB2|DB2IPV6 )
7577
FIELDS=',isp varchar(255) NOT NULL'
7678
;;
7779

78-
DB3CSV|DB3LITECSV|DB3CSVIPV6|DB3LITECSVIPV6 )
80+
DB3|DB3LITE|DB3IPV6|DB3LITEIPV6 )
7981
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL'
8082
;;
8183

82-
DB4CSV|DB4CSVIPV6 )
84+
DB4|DB4IPV6 )
8385
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,isp varchar(255) NOT NULL'
8486
;;
8587

86-
DB5CSV|DB5LITECSV|DB5CSVIPV6|DB5LITECSVIPV6 )
88+
DB5|DB5LITE|DB5IPV6|DB5LITEIPV6 )
8789
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL'
8890
;;
8991

90-
DB6CSV|DB6CSVIPV6 )
92+
DB6|DB6IPV6 )
9193
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,isp varchar(255) NOT NULL'
9294
;;
9395

94-
DB7CSV|DB7CSVIPV6 )
96+
DB7|DB7IPV6 )
9597
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL'
9698
;;
9799

98-
DB8CSV|DB8CSVIPV6 )
100+
DB8|DB8IPV6 )
99101
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL'
100102
;;
101103

102-
DB9CSV|DB9LITECSV|DB9CSVIPV6|DB9LITECSVIPV6 )
104+
DB9|DB9LITE|DB9IPV6|DB9LITEIPV6 )
103105
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL'
104106
;;
105107

106-
DB10CSV|DB10CSVIPV6 )
108+
DB10|DB10IPV6 )
107109
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL'
108110
;;
109111

110-
DB11CSV|DB11LITECSV|DB11CSVIPV6|DB11LITECSVIPV6 )
112+
DB11|DB11LITE|DB11IPV6|DB11LITEIPV6 )
111113
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL,time_zone varchar(8) NULL DEFAULT NULL'
112114
;;
113115

114-
DB12CSV|DB12CSVIPV6 )
116+
DB12|DB12IPV6 )
115117
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL,time_zone varchar(8) NULL DEFAULT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL'
116118
;;
117119

118-
DB13CSV|DB13CSVIPV6 )
120+
DB13|DB13IPV6 )
119121
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,time_zone varchar(8) NULL DEFAULT NULL,net_speed varchar(8) NOT NULL'
120122
;;
121123

122-
DB14CSV|DB14CSVIPV6 )
124+
DB14|DB14IPV6 )
123125
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL,time_zone varchar(8) NULL DEFAULT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL,net_speed varchar(8) NOT NULL'
124126
;;
125127

126-
DB15CSV|DB15CSVIPV6 )
128+
DB15|DB15IPV6 )
127129
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL,time_zone varchar(8) NULL DEFAULT NULL,idd_code varchar(5) NOT NULL,area_code varchar(30) NOT NULL'
128130
;;
129131

130-
DB16CSV|DB16CSVIPV6 )
132+
DB16|DB16IPV6 )
131133
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL,time_zone varchar(8) NULL DEFAULT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL,net_speed varchar(8) NOT NULL,idd_code varchar(5) NOT NULL,area_code varchar(30) NOT NULL'
132134
;;
133135

134-
DB17CSV|DB17CSVIPV6 )
136+
DB17|DB17IPV6 )
135137
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,time_zone varchar(8) NULL DEFAULT NULL,net_speed varchar(8) NOT NULL,weather_station_code varchar(10) NOT NULL,weather_station_name varchar(128) NOT NULL'
136138
;;
137139

138-
DB18CSV|DB18CSVIPV6 )
140+
DB18|DB18IPV6 )
139141
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL,time_zone varchar(8) NULL DEFAULT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL,net_speed varchar(8) NOT NULL,idd_code varchar(5) NOT NULL,area_code varchar(30) NOT NULL,weather_station_code varchar(10) NOT NULL,weather_station_name varchar(128) NOT NULL'
140142
;;
141143

142-
DB19CSV|DB19CSVIPV6 )
144+
DB19|DB19IPV6 )
143145
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL,mcc varchar(128) NULL DEFAULT NULL,mnc varchar(128) NULL DEFAULT NULL,mobile_brand varchar(128) NULL DEFAULT NULL'
144146
;;
145147

146-
DB20CSV|DB20CSVIPV6 )
148+
DB20|DB20IPV6 )
147149
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL,time_zone varchar(8) NULL DEFAULT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL,net_speed varchar(8) NOT NULL,idd_code varchar(5) NOT NULL,area_code varchar(30) NOT NULL,weather_station_code varchar(10) NOT NULL,weather_station_name varchar(128) NOT NULL,mcc varchar(128) NULL DEFAULT NULL,mnc varchar(128) NULL DEFAULT NULL,mobile_brand varchar(128) NULL DEFAULT NULL'
148150
;;
149151

150-
DB21CSV|DB21CSVIPV6 )
152+
DB21|DB21IPV6 )
151153
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL,time_zone varchar(8) NULL DEFAULT NULL,idd_code varchar(5) NOT NULL,area_code varchar(30) NOT NULL,elevation integer NOT NULL'
152154
;;
153155

154-
DB22CSV|DB22CSVIPV6 )
156+
DB22|DB22IPV6 )
155157
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL,time_zone varchar(8) NULL DEFAULT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL,net_speed varchar(8) NOT NULL,idd_code varchar(5) NOT NULL,area_code varchar(30) NOT NULL,weather_station_code varchar(10) NOT NULL,weather_station_name varchar(128) NOT NULL,mcc varchar(128) NULL DEFAULT NULL,mnc varchar(128) NULL DEFAULT NULL,mobile_brand varchar(128) NULL DEFAULT NULL,elevation integer NOT NULL'
156158
;;
157159

158-
DB23CSV|DB23CSVIPV6 )
160+
DB23|DB23IPV6 )
159161
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL,mcc varchar(128) NULL DEFAULT NULL,mnc varchar(128) NULL DEFAULT NULL,mobile_brand varchar(128) NULL DEFAULT NULL,usage_type varchar(11) NOT NULL'
160162
;;
161163

162-
DB24CSV|DB24CSVIPV6 )
164+
DB24|DB24IPV6 )
163165
FIELDS=',region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,latitude varchar(20) NOT NULL,longitude varchar(20) NOT NULL,zip_code varchar(30) NULL DEFAULT NULL,time_zone varchar(8) NULL DEFAULT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL,net_speed varchar(8) NOT NULL,idd_code varchar(5) NOT NULL,area_code varchar(30) NOT NULL,weather_station_code varchar(10) NOT NULL,weather_station_name varchar(128) NOT NULL,mcc varchar(128) NULL DEFAULT NULL,mnc varchar(128) NULL DEFAULT NULL,mobile_brand varchar(128) NULL DEFAULT NULL,elevation integer NOT NULL,usage_type varchar(11) NOT NULL'
164166
;;
165167

166-
PX1CSV|PX1LITECSV )
168+
PX1|PX1LITECSV )
167169
FIELDS=',country_code char(2) NOT NULL,country_name varchar(64) NOT NULL'
168170
;;
169171

170-
PX2CSV|PX2LITECSV )
172+
PX2|PX2LITECSV )
171173
FIELDS=',proxy_type varchar(3) NOT NULL, country_code char(2) NOT NULL,country_name varchar(64) NOT NULL'
172174
;;
173175

174-
PX3CSV|PX3LITECSV )
176+
PX3|PX3LITECSV )
175177
FIELDS=',proxy_type varchar(3) NOT NULL, country_code char(2) NOT NULL,country_name varchar(64) NOT NULL,region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL'
176178
;;
177179

178-
PX4CSV|PX4LITECSV )
180+
PX4|PX4LITECSV )
179181
FIELDS=',proxy_type varchar(3) NOT NULL, country_code char(2) NOT NULL,country_name varchar(64) NOT NULL,region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,isp varchar(255) NOT NULL'
180182
;;
181183

182-
PX5CSV|PX5LITECSV )
184+
PX5|PX5LITECSV )
183185
FIELDS=',proxy_type varchar(3) NOT NULL, country_code char(2) NOT NULL,country_name varchar(64) NOT NULL,region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL'
184186
;;
185187

186-
PX6CSV|PX6LITECSV )
188+
PX6|PX6LITECSV )
187189
FIELDS=',proxy_type varchar(3) NOT NULL, country_code char(2) NOT NULL,country_name varchar(64) NOT NULL,region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL,usage_type varchar(11) NOT NULL'
188190
;;
189191

190-
PX7CSV|PX7LITECSV )
192+
PX7|PX7LITECSV )
191193
FIELDS=',proxy_type varchar(3) NOT NULL, country_code char(2) NOT NULL,country_name varchar(64) NOT NULL,region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL,usage_type varchar(11) NOT NULL,asn varchar(6) NOT NULL,"as" varchar(256)'
192194
;;
193195

194-
PX8CSV|PX8LITECSV )
196+
PX8|PX8LITECSV )
195197
FIELDS=',proxy_type varchar(3) NOT NULL, country_code char(2) NOT NULL,country_name varchar(64) NOT NULL,region_name varchar(128) NOT NULL,city_name varchar(128) NOT NULL,isp varchar(255) NOT NULL,domain varchar(128) NOT NULL,usage_type varchar(11) NOT NULL,asn varchar(6) NOT NULL,"as" varchar(256),last_seen integer NOT NULL'
196198
;;
197199
esac
@@ -211,32 +213,28 @@ sudo -u postgres psql -c 'CREATE INDEX idx_ip_range ON public.ip2location_databa
211213

212214
echo -n ' > [PostgreSQL] Import CSV data into "ip2location_database_tmp" '
213215

214-
RESPONSE="$(sudo -u postgres psql -c 'COPY ip2location_database_tmp FROM '\'''/_tmp/$CSV''\'' WITH CSV QUOTE AS '\''"'\'';' ip2location_database 2>&1)"
216+
RESPONSE="$(sudo -u postgres psql -c 'COPY ip2location_database_tmp FROM '\'''/_tmp/$CSV''\'' WITH CSV QUOTE AS '\''"'\'';' ip2location_database 2>&1)"
215217

216218
[ -z "$(echo $RESPONSE | grep 'COPY')" ] && error '[ERROR]' || success '[OK]'
217219

218-
echo ' > [PostgreSQL] Drop table "ip2location_database" '
219-
220-
RESPONSE="$(sudo -u postgres psql -c 'DROP TABLE IF EXISTS ip2location_database;' ip2location_database 2>&1)"
221-
222-
[ ! -z "$(echo $RESPONSE | grep 'ERROR')" ] && error '[ERROR]' || success '[OK]'
223-
224-
echo ' > [PostgreSQL] Rename table "ip2location_database_tmp" to "ip2location_database" '
220+
echo -n ' > [PostgreSQL] Rename table "ip2location_database_tmp" to "ip2location_database" '
225221

226222
RESPONSE="$(sudo -u postgres psql -c 'ALTER TABLE ip2location_database_tmp RENAME TO ip2location_database;' ip2location_database 2>&1)"
227223

228224
[ ! -z "$(echo $RESPONSE | grep 'ERROR')" ] && error '[ERROR]' || success '[OK]'
229225

230-
echo ' > [PostgreSQL] Update PostgreSQL password for user "postgres" '
226+
echo -n ' > [PostgreSQL] Update PostgreSQL password for user "postgres" '
231227

232228
if [ "$POSTGRESQL_PASSWORD" != "FALSE" ]; then
233229
DBPASS="$POSTGRESQL_PASSWORD"
234230
else
235231
DBPASS="$(< /dev/urandom tr -dc A-Za-z0-9 | head -c8)"
236232
fi
237233

234+
success '[OK]'
235+
238236
sudo -u postgres psql -U postgres -d postgres -c "ALTER USER postgres WITH PASSWORD '$DBPASS';" > /dev/null
239-
sudo -u postgres psql -U postgres -d postgres -c 'DROP FUNCTION IF EXISTS inet_to_bigint(inet);CREATE OR REPLACE FUNCTION inet_to_bigint(inet) RETURNS bigint AS $$ SELECT $1 - inet '\''0.0.0.0'\'' $$ LANGUAGE SQL strict immutable;GRANT execute ON FUNCTION inet_to_bigint(inet) TO public;' > /dev/null
237+
sudo -u postgres psql -U postgres -d postgres -c 'CREATE FUNCTION inet_to_bigint(inet) RETURNS bigint AS $$ SELECT $1 - inet '\''0.0.0.0'\'' $$ LANGUAGE SQL strict immutable;GRANT execute ON FUNCTION inet_to_bigint(inet) TO public;' > /dev/null
240238

241239
echo " > Setup completed"
242240
echo ""
@@ -248,7 +246,7 @@ echo ""
248246

249247
rm -rf /_tmp
250248
echo '' > /setup_done
251-
service postgresql stop >/dev/null 2>&1
249+
service postgresql stop >/dev/null
252250
sleep 5
253251

254252
cd

0 commit comments

Comments
 (0)