From 014b900d3ed7f668aeaa45e1ef0a0935e46d8d14 Mon Sep 17 00:00:00 2001 From: Michal Vaner Date: Mon, 8 Sep 2008 23:44:54 +0200 Subject: [PATCH] The propper way to move configs to cf/ --- PciIds/Config.pm | 2 +- PciIds/Startup.pm | 2 +- PciIds/Users.pm | 2 +- {cf/help => help}/account | 0 {cf/help => help}/admin | 0 {cf/help => help}/index | 0 {cf/help => help}/jump | 0 {cf/help => help}/list | 0 {cf/help => help}/mailsubmit | 0 {cf/help => help}/newhistory | 0 {cf/help => help}/newitem | 0 {cf/help => help}/notifications | 0 {cf/help => help}/pci | 0 {cf/help => help}/pci_class | 0 {cf/help => help}/profile | 0 scripts/initdb.pl | 2 +- 16 files changed, 4 insertions(+), 4 deletions(-) rename {cf/help => help}/account (100%) rename {cf/help => help}/admin (100%) rename {cf/help => help}/index (100%) rename {cf/help => help}/jump (100%) rename {cf/help => help}/list (100%) rename {cf/help => help}/mailsubmit (100%) rename {cf/help => help}/newhistory (100%) rename {cf/help => help}/newitem (100%) rename {cf/help => help}/notifications (100%) rename {cf/help => help}/pci (100%) rename {cf/help => help}/pci_class (100%) rename {cf/help => help}/profile (100%) diff --git a/PciIds/Config.pm b/PciIds/Config.pm index bd1432f..4b323c6 100644 --- a/PciIds/Config.pm +++ b/PciIds/Config.pm @@ -27,7 +27,7 @@ our @EXPORT = qw(&checkConf &defConf %config &confList); our %config; sub loadConf() { - open CONFIG, $directory."/config" or die "Config file not found. Make sure config is in the directory and the correct path is in Startup.pm\n"; + open CONFIG, $directory."cf/config" or die "Config file not found. Make sure config is in the cf directory and the correct path is in Startup.pm\n"; foreach( ) { next if( /^\s*(|#.*)$/ ); chomp; diff --git a/PciIds/Startup.pm b/PciIds/Startup.pm index 478b4ba..ee7d9db 100644 --- a/PciIds/Startup.pm +++ b/PciIds/Startup.pm @@ -22,7 +22,7 @@ use warnings; use base 'Exporter'; #Where are data? -our $directory = '/home/vorner/prog/pciids/cf/'; +our $directory = '/home/vorner/prog/pciids/'; our @EXPORT=qw($directory); #Where are the modules? diff --git a/PciIds/Users.pm b/PciIds/Users.pm index c44bc3b..6c660d2 100644 --- a/PciIds/Users.pm +++ b/PciIds/Users.pm @@ -143,7 +143,7 @@ sub pushProfile( $$$$ ) { checkConf( [ 'passwdsalt', 'regmailsalt', 'authsalt' ] ); defConf( { 'authtime' => 2100, 'regenauthtime' => 300 } ); -open PRIVS, $directory."/rights" or die "Could not open privilege definitions\n"; +open PRIVS, $directory."cf/rights" or die "Could not open privilege definitions\n"; foreach( ) { my( $num, $name ) = /^(\d+)\s+(.*)$/ or die "Invalid syntax in privileges\n"; $privnames{$num} = $name; diff --git a/cf/help/account b/help/account similarity index 100% rename from cf/help/account rename to help/account diff --git a/cf/help/admin b/help/admin similarity index 100% rename from cf/help/admin rename to help/admin diff --git a/cf/help/index b/help/index similarity index 100% rename from cf/help/index rename to help/index diff --git a/cf/help/jump b/help/jump similarity index 100% rename from cf/help/jump rename to help/jump diff --git a/cf/help/list b/help/list similarity index 100% rename from cf/help/list rename to help/list diff --git a/cf/help/mailsubmit b/help/mailsubmit similarity index 100% rename from cf/help/mailsubmit rename to help/mailsubmit diff --git a/cf/help/newhistory b/help/newhistory similarity index 100% rename from cf/help/newhistory rename to help/newhistory diff --git a/cf/help/newitem b/help/newitem similarity index 100% rename from cf/help/newitem rename to help/newitem diff --git a/cf/help/notifications b/help/notifications similarity index 100% rename from cf/help/notifications rename to help/notifications diff --git a/cf/help/pci b/help/pci similarity index 100% rename from cf/help/pci rename to help/pci diff --git a/cf/help/pci_class b/help/pci_class similarity index 100% rename from cf/help/pci_class rename to help/pci_class diff --git a/cf/help/profile b/help/profile similarity index 100% rename from cf/help/profile rename to help/profile diff --git a/scripts/initdb.pl b/scripts/initdb.pl index 45589f6..5194321 100755 --- a/scripts/initdb.pl +++ b/scripts/initdb.pl @@ -47,7 +47,7 @@ sub createTable( $ ) { } my $dbh = connectDb(); -open TABLES, $directory."tables" or die "Could not open table definitions\n"; +open TABLES, $directory."cf/tables" or die "Could not open table definitions\n"; foreach( ) { chomp; if( /^\s*$/ ) { -- 2.39.5