Wed Jan 26 19:42:36 PST 2005
- Previous message: [Slony1-commit] By darcyb: Add proper detection of sed since slonik relies on haveing
- Next message: [Slony1-commit] By darcyb: Bring sed detection forward
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Log Message:
-----------
Remove non required hash-bangs, and setup hash-bang substitution, provide method to remove .pl from scripts
Modified Files:
--------------
slony1-engine/tools/altperl:
Makefile (r1.1 -> r1.2)
build_env.pl (r1.5 -> r1.6)
create_set.pl (r1.9 -> r1.10)
drop_node.pl (r1.5 -> r1.6)
drop_set.pl (r1.5 -> r1.6)
failover.pl (r1.4 -> r1.5)
init_cluster.pl (r1.7 -> r1.8)
merge_sets.pl (r1.5 -> r1.6)
move_set.pl (r1.4 -> r1.5)
regenerate-listens.pl (r1.1 -> r1.2)
restart_node.pl (r1.3 -> r1.4)
restart_nodes.pl (r1.2 -> r1.3)
show_configuration.pl (r1.1 -> r1.2)
show_nodes.pl (r1.1 -> r1.2)
slon-tools.pm (r1.14 -> r1.15)
slon.env (r1.7 -> r1.8)
slon_kill.pl (r1.6 -> r1.7)
slon_pushsql.pl (r1.5 -> r1.6)
slon_start.pl (r1.7 -> r1.8)
slon_watchdog.pl (r1.4 -> r1.5)
slon_watchdog2.pl (r1.4 -> r1.5)
subscribe_set.pl (r1.5 -> r1.6)
uninstall_nodes.pl (r1.3 -> r1.4)
unsubscribe_set.pl (r1.3 -> r1.4)
update_nodes.pl (r1.2 -> r1.3)
-------------- next part --------------
Index: merge_sets.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/merge_sets.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ltools/altperl/merge_sets.pl -Ltools/altperl/merge_sets.pl -u -w -r1.5 -r1.6
--- tools/altperl/merge_sets.pl
+++ tools/altperl/merge_sets.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: create_set.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/create_set.pl,v
retrieving revision 1.9
retrieving revision 1.10
diff -Ltools/altperl/create_set.pl -Ltools/altperl/create_set.pl -u -w -r1.9 -r1.10
--- tools/altperl/create_set.pl
+++ tools/altperl/create_set.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@@PERL@@
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: subscribe_set.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/subscribe_set.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ltools/altperl/subscribe_set.pl -Ltools/altperl/subscribe_set.pl -u -w -r1.5 -r1.6
--- tools/altperl/subscribe_set.pl
+++ tools/altperl/subscribe_set.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: init_cluster.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/init_cluster.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -Ltools/altperl/init_cluster.pl -Ltools/altperl/init_cluster.pl -u -w -r1.7 -r1.8
--- tools/altperl/init_cluster.pl
+++ tools/altperl/init_cluster.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: slon.env
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon.env,v
retrieving revision 1.7
retrieving revision 1.8
diff -Ltools/altperl/slon.env -Ltools/altperl/slon.env -u -w -r1.7 -r1.8
--- tools/altperl/slon.env
+++ tools/altperl/slon.env
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+# -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: drop_set.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/drop_set.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ltools/altperl/drop_set.pl -Ltools/altperl/drop_set.pl -u -w -r1.5 -r1.6
--- tools/altperl/drop_set.pl
+++ tools/altperl/drop_set.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: slon_start.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon_start.pl,v
retrieving revision 1.7
retrieving revision 1.8
diff -Ltools/altperl/slon_start.pl -Ltools/altperl/slon_start.pl -u -w -r1.7 -r1.8
--- tools/altperl/slon_start.pl
+++ tools/altperl/slon_start.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: unsubscribe_set.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/unsubscribe_set.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ltools/altperl/unsubscribe_set.pl -Ltools/altperl/unsubscribe_set.pl -u -w -r1.3 -r1.4
--- tools/altperl/unsubscribe_set.pl
+++ tools/altperl/unsubscribe_set.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: show_nodes.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/show_nodes.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltools/altperl/show_nodes.pl -Ltools/altperl/show_nodes.pl -u -w -r1.1 -r1.2
--- tools/altperl/show_nodes.pl
+++ tools/altperl/show_nodes.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: restart_node.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/restart_node.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ltools/altperl/restart_node.pl -Ltools/altperl/restart_node.pl -u -w -r1.3 -r1.4
--- tools/altperl/restart_node.pl
+++ tools/altperl/restart_node.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: failover.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/failover.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -Ltools/altperl/failover.pl -Ltools/altperl/failover.pl -u -w -r1.4 -r1.5
--- tools/altperl/failover.pl
+++ tools/altperl/failover.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: Makefile
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltools/altperl/Makefile -Ltools/altperl/Makefile -u -w -r1.1 -r1.2
--- tools/altperl/Makefile
+++ tools/altperl/Makefile
@@ -1,5 +1,5 @@
# ----------
-# Makefile for the HOWTOs
+# Makefile
#
# Copyright (c) 2003-2004, PostgreSQL Global Development Group
# $Id$
@@ -10,7 +10,7 @@
slony_top_builddir = ../..
include $(slony_top_builddir)/Makefile.global
-DISTFILES = Makefile ToDo README $(wildcard *.pl*) $(wildcard *.pm*) $(wildcard *.env*)
+DISTFILES = Makefile ToDo README $(wildcard *.pl) $(wildcard *.pm) $(wildcard *.env)
distdir: $(DISTFILES)
mkdir $(distdir)/$(subdir)
@@ -20,4 +20,22 @@
done
clean distclean maintainer-clean:
-
+ @for file in $(wildcard *.pl); do \
+ tmpname=`echo $$file | $(SED) "s#\.pl##"` ; \
+ rm $$tmpname ; \
+ done
+all:
+ifndef PERL
+ @echo "You need perl to make use of these tools"
+else
+ifndef SED
+ @echo "You need sed to use slony"
+ exit 1;
+else
+ @for file in $(wildcard *.pl) ; do \
+ tmpname=`echo $$file | $(SED) "s#\.pl##"` ; \
+ $(SED) -e "s#@@PERL@@#$(PERL)#" $$file > $$tmpname; \
+ chmod 755 $$tmpname; \
+ done
+endif
+endif
Index: slon_watchdog2.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon_watchdog2.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -Ltools/altperl/slon_watchdog2.pl -Ltools/altperl/slon_watchdog2.pl -u -w -r1.4 -r1.5
--- tools/altperl/slon_watchdog2.pl
+++ tools/altperl/slon_watchdog2.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: drop_node.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/drop_node.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ltools/altperl/drop_node.pl -Ltools/altperl/drop_node.pl -u -w -r1.5 -r1.6
--- tools/altperl/drop_node.pl
+++ tools/altperl/drop_node.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: slon-tools.pm
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon-tools.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -Ltools/altperl/slon-tools.pm -Ltools/altperl/slon-tools.pm -u -w -r1.14 -r1.15
--- tools/altperl/slon-tools.pm
+++ tools/altperl/slon-tools.pm
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+# -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: regenerate-listens.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/regenerate-listens.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltools/altperl/regenerate-listens.pl -Ltools/altperl/regenerate-listens.pl -u -w -r1.1 -r1.2
--- tools/altperl/regenerate-listens.pl
+++ tools/altperl/regenerate-listens.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!@@PERL@@
# $Id$
# Copyright 2005
# Christopher B. Browne
Index: restart_nodes.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/restart_nodes.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ltools/altperl/restart_nodes.pl -Ltools/altperl/restart_nodes.pl -u -w -r1.2 -r1.3
--- tools/altperl/restart_nodes.pl
+++ tools/altperl/restart_nodes.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: slon_watchdog.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon_watchdog.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -Ltools/altperl/slon_watchdog.pl -Ltools/altperl/slon_watchdog.pl -u -w -r1.4 -r1.5
--- tools/altperl/slon_watchdog.pl
+++ tools/altperl/slon_watchdog.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: uninstall_nodes.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/uninstall_nodes.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -Ltools/altperl/uninstall_nodes.pl -Ltools/altperl/uninstall_nodes.pl -u -w -r1.3 -r1.4
--- tools/altperl/uninstall_nodes.pl
+++ tools/altperl/uninstall_nodes.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: move_set.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/move_set.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -Ltools/altperl/move_set.pl -Ltools/altperl/move_set.pl -u -w -r1.4 -r1.5
--- tools/altperl/move_set.pl
+++ tools/altperl/move_set.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: show_configuration.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/show_configuration.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -Ltools/altperl/show_configuration.pl -Ltools/altperl/show_configuration.pl -u -w -r1.1 -r1.2
--- tools/altperl/show_configuration.pl
+++ tools/altperl/show_configuration.pl
@@ -1,4 +1,4 @@
-#!perl #-*- perl -*-
+#!@@PERL@@ #-*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: build_env.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/build_env.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ltools/altperl/build_env.pl -Ltools/altperl/build_env.pl -u -w -r1.5 -r1.6
--- tools/altperl/build_env.pl
+++ tools/altperl/build_env.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERl@@ # -*- perl -*-
# $Id$
# Contributed by:
# Joe Kalash
Index: slon_pushsql.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon_pushsql.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -Ltools/altperl/slon_pushsql.pl -Ltools/altperl/slon_pushsql.pl -u -w -r1.5 -r1.6
--- tools/altperl/slon_pushsql.pl
+++ tools/altperl/slon_pushsql.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
Index: slon_kill.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/slon_kill.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -Ltools/altperl/slon_kill.pl -Ltools/altperl/slon_kill.pl -u -w -r1.6 -r1.7
--- tools/altperl/slon_kill.pl
+++ tools/altperl/slon_kill.pl
@@ -1,4 +1,4 @@
-#!/usr/bin/perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Kill all slon instances for the current setname
# Author: Christopher Browne
Index: update_nodes.pl
===================================================================
RCS file: /usr/local/cvsroot/slony1/slony1-engine/tools/altperl/update_nodes.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -Ltools/altperl/update_nodes.pl -Ltools/altperl/update_nodes.pl -u -w -r1.2 -r1.3
--- tools/altperl/update_nodes.pl
+++ tools/altperl/update_nodes.pl
@@ -1,4 +1,4 @@
-#!perl # -*- perl -*-
+#!@@PERL@@ # -*- perl -*-
# $Id$
# Author: Christopher Browne
# Copyright 2004 Afilias Canada
- Previous message: [Slony1-commit] By darcyb: Add proper detection of sed since slonik relies on haveing
- Next message: [Slony1-commit] By darcyb: Bring sed detection forward
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
More information about the Slony1-commit mailing list