Update of /home/cvsd/slony1/slony1-engine/tools/altperl
In directory main.slony.info:/tmp/cvs-serv12849

Modified Files:
	Makefile slon_kill.pl slon_start.pl slon_watchdog.pl 
	slon_watchdog2.pl slonik_create_set.pl slonik_drop_node.pl 
	slonik_drop_set.pl slonik_drop_table.pl 
	slonik_execute_script.pl slonik_failover.pl 
	slonik_init_cluster.pl slonik_merge_sets.pl slonik_move_set.pl 
	slonik_print_preamble.pl slonik_restart_node.pl 
	slonik_store_node.pl slonik_subscribe_set.pl 
	slonik_uninstall_nodes.pl slonik_unsubscribe_set.pl 
	slonik_update_nodes.pl slony_show_configuration.pl 
Log Message:
Apply changes for bug #31...

http://www.slony.info/bugzilla/show_bug.cgi?id=31

changes over to use PERLSHAREDIR in all of the scripts, and substitutes
that consistently across the various .pl files



Index: slon_start.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slon_start.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** slon_start.pl	22 Feb 2005 17:11:18 -0000	1.14
--- slon_start.pl	14 Feb 2008 16:41:35 -0000	1.15
***************
*** 38,42 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 38,42 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slon_watchdog.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slon_watchdog.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** slon_watchdog.pl	6 Dec 2006 18:37:58 -0000	1.13
--- slon_watchdog.pl	14 Feb 2008 16:41:35 -0000	1.14
***************
*** 28,32 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 28,32 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_store_node.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_store_node.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** slonik_store_node.pl	28 Nov 2006 21:41:37 -0000	1.4
--- slonik_store_node.pl	14 Feb 2008 16:41:35 -0000	1.5
***************
*** 28,32 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 28,32 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: Makefile
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile	4 Jul 2007 15:10:40 -0000	1.16
--- Makefile	14 Feb 2008 16:41:35 -0000	1.17
***************
*** 27,31 ****
  		$(SED) -e "s#@@PERL@@#$(PERL)#;" \
                         -e "s#@@SYSCONFDIR@@#$(sysconfdir)#;" \
!                        -e "s#@@PGLIBDIR@@#$(pgsharedir)#;" \
                         -e "s#@@PGBINDIR@@#$(pgbindir)#;" \
                         -e "s#@@SLONBINDIR@@#$(slonbindir)#;" \
--- 27,31 ----
  		$(SED) -e "s#@@PERL@@#$(PERL)#;" \
                         -e "s#@@SYSCONFDIR@@#$(sysconfdir)#;" \
!                        -e "s#@@PERLSHAREDIR@@#$(perlsharedir)#;" \
                         -e "s#@@PGBINDIR@@#$(pgbindir)#;" \
                         -e "s#@@SLONBINDIR@@#$(slonbindir)#;" \

Index: slonik_execute_script.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_execute_script.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** slonik_execute_script.pl	13 Mar 2007 15:35:13 -0000	1.3
--- slonik_execute_script.pl	14 Feb 2008 16:41:35 -0000	1.4
***************
*** 51,55 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 51,55 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_drop_table.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_drop_table.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** slonik_drop_table.pl	27 Oct 2006 17:52:10 -0000	1.3
--- slonik_drop_table.pl	14 Feb 2008 16:41:35 -0000	1.4
***************
*** 32,36 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 32,36 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_update_nodes.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_update_nodes.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slonik_update_nodes.pl	27 Oct 2006 17:52:10 -0000	1.2
--- slonik_update_nodes.pl	14 Feb 2008 16:41:35 -0000	1.3
***************
*** 26,30 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 26,30 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_subscribe_set.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_subscribe_set.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slonik_subscribe_set.pl	27 Oct 2006 15:24:12 -0000	1.2
--- slonik_subscribe_set.pl	14 Feb 2008 16:41:35 -0000	1.3
***************
*** 26,30 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 26,30 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_failover.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_failover.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slonik_failover.pl	27 Oct 2006 17:52:10 -0000	1.2
--- slonik_failover.pl	14 Feb 2008 16:41:35 -0000	1.3
***************
*** 30,34 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 30,34 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_print_preamble.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_print_preamble.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** slonik_print_preamble.pl	27 Oct 2006 17:52:10 -0000	1.3
--- slonik_print_preamble.pl	14 Feb 2008 16:41:35 -0000	1.4
***************
*** 30,34 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 30,34 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_drop_set.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_drop_set.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** slonik_drop_set.pl	2 Jan 2007 17:12:33 -0000	1.3
--- slonik_drop_set.pl	14 Feb 2008 16:41:35 -0000	1.4
***************
*** 38,42 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 38,42 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slon_kill.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slon_kill.pl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** slon_kill.pl	16 Mar 2005 20:37:54 -0000	1.12
--- slon_kill.pl	14 Feb 2008 16:41:35 -0000	1.13
***************
*** 35,39 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 35,39 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_init_cluster.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_init_cluster.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** slonik_init_cluster.pl	28 Nov 2006 21:41:37 -0000	1.6
--- slonik_init_cluster.pl	14 Feb 2008 16:41:35 -0000	1.7
***************
*** 28,32 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 28,32 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_unsubscribe_set.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_unsubscribe_set.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slonik_unsubscribe_set.pl	27 Oct 2006 17:52:10 -0000	1.2
--- slonik_unsubscribe_set.pl	14 Feb 2008 16:41:35 -0000	1.3
***************
*** 26,30 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 26,30 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_move_set.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_move_set.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slonik_move_set.pl	27 Oct 2006 17:52:10 -0000	1.2
--- slonik_move_set.pl	14 Feb 2008 16:41:35 -0000	1.3
***************
*** 26,30 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 26,30 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_uninstall_nodes.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_uninstall_nodes.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** slonik_uninstall_nodes.pl	2 Jan 2007 17:12:33 -0000	1.3
--- slonik_uninstall_nodes.pl	14 Feb 2008 16:41:35 -0000	1.4
***************
*** 35,39 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 35,39 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_merge_sets.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_merge_sets.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slonik_merge_sets.pl	27 Oct 2006 17:52:10 -0000	1.2
--- slonik_merge_sets.pl	14 Feb 2008 16:41:35 -0000	1.3
***************
*** 26,30 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 26,30 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_restart_node.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_restart_node.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slonik_restart_node.pl	27 Oct 2006 17:52:10 -0000	1.2
--- slonik_restart_node.pl	14 Feb 2008 16:41:35 -0000	1.3
***************
*** 28,32 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 28,32 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slonik_drop_node.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_drop_node.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** slonik_drop_node.pl	2 Jan 2007 17:12:33 -0000	1.3
--- slonik_drop_node.pl	14 Feb 2008 16:41:35 -0000	1.4
***************
*** 40,44 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 40,44 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slon_watchdog2.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slon_watchdog2.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** slon_watchdog2.pl	6 Dec 2006 18:37:58 -0000	1.10
--- slon_watchdog2.pl	14 Feb 2008 16:41:35 -0000	1.11
***************
*** 4,8 ****
  # Copyright 2004 Afilias Canada
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require '@@SYSCONFDIR@@/slon_tools.conf';
  
--- 4,8 ----
  # Copyright 2004 Afilias Canada
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require '@@SYSCONFDIR@@/slon_tools.conf';
  

Index: slonik_create_set.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slonik_create_set.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** slonik_create_set.pl	2 Jan 2007 17:12:33 -0000	1.5
--- slonik_create_set.pl	14 Feb 2008 16:41:35 -0000	1.6
***************
*** 28,32 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 28,32 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  

Index: slony_show_configuration.pl
===================================================================
RCS file: /home/cvsd/slony1/slony1-engine/tools/altperl/slony_show_configuration.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** slony_show_configuration.pl	4 Jan 2008 19:52:35 -0000	1.2
--- slony_show_configuration.pl	14 Feb 2008 16:41:35 -0000	1.3
***************
*** 27,31 ****
  }
  
! require '@@PGLIBDIR@@/slon-tools.pm';
  require $CONFIG_FILE;
  
--- 27,31 ----
  }
  
! require '@@PERLSHAREDIR@@/slon-tools.pm';
  require $CONFIG_FILE;