From 200d973581ea808edf56ea249bff0fb0256b039c Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Sun, 25 Jan 2015 04:04:53 -0800 Subject: suppress notices that might be confusing --- install/migrate-mypg.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install') diff --git a/install/migrate-mypg.php b/install/migrate-mypg.php index 10bf1e387..cfd4f681a 100644 --- a/install/migrate-mypg.php +++ b/install/migrate-mypg.php @@ -33,7 +33,7 @@ function parse_htconfig($file) { function get_configtype(array $data) { if(!isset($data['host'], $data['user'], $data['pass'], $data['data'])) return 'none'; - if($data['type'] == 1) + if(@$data['type'] == 1) return 'pgsql'; return 'mysql'; } @@ -112,7 +112,7 @@ foreach(array('install','include','mod','view') as $dir) { } $cfgfile = '.htconfig.php'; -if($argv[1] == '--resume') { +if($argc >= 2 && $argv[1] == '--resume') { if($argc < 4) { echo "Resume usage {$argv[0]} --resume \n"; exit(); -- cgit v1.2.3 From 0ca71a6b5e007f59aca055156f8546e84e972ca6 Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Sun, 25 Jan 2015 04:05:28 -0800 Subject: update schema --- install/migrate_mypg_fixseq.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install') diff --git a/install/migrate_mypg_fixseq.sql b/install/migrate_mypg_fixseq.sql index 806c5cf31..1dcb85fff 100644 --- a/install/migrate_mypg_fixseq.sql +++ b/install/migrate_mypg_fixseq.sql @@ -52,4 +52,4 @@ SELECT SETVAL('public.xign_id_seq', COALESCE(MAX(id), 1) ) FROM public.xign; SELECT SETVAL('public.xlink_xlink_id_seq', COALESCE(MAX(xlink_id), 1) ) FROM public.xlink; SELECT SETVAL('public.xtag_xtag_id_seq', COALESCE(MAX(xtag_id), 1) ) FROM public.xtag; - + SELECT SETVAL('public.xperm_id_seq', COALESCE(MAX(xp_id), 1) ) FROM public.xperm; -- cgit v1.2.3 From dc259ba027e75ec8ababff322940165613b286ed Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Sun, 25 Jan 2015 04:13:14 -0800 Subject: typo --- install/migrate_mypg_fixseq.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install') diff --git a/install/migrate_mypg_fixseq.sql b/install/migrate_mypg_fixseq.sql index 1dcb85fff..fde187dc7 100644 --- a/install/migrate_mypg_fixseq.sql +++ b/install/migrate_mypg_fixseq.sql @@ -52,4 +52,4 @@ SELECT SETVAL('public.xign_id_seq', COALESCE(MAX(id), 1) ) FROM public.xign; SELECT SETVAL('public.xlink_xlink_id_seq', COALESCE(MAX(xlink_id), 1) ) FROM public.xlink; SELECT SETVAL('public.xtag_xtag_id_seq', COALESCE(MAX(xtag_id), 1) ) FROM public.xtag; - SELECT SETVAL('public.xperm_id_seq', COALESCE(MAX(xp_id), 1) ) FROM public.xperm; + SELECT SETVAL('public.xperm_xp_id_seq', COALESCE(MAX(xp_id), 1) ) FROM public.xperm; -- cgit v1.2.3