From 3204caa98dc491978f9cd8c6b1c392609c7218c5 Mon Sep 17 00:00:00 2001 From: Michael Stapelberg Date: Sun, 31 Jul 2011 23:11:05 +0200 Subject: [PATCH] i3-migrate-config-to-v4: drop the .pl suffix As lintian (a Debian package checker) mentions, it is more clever to install it without the extension, since the implementation language might change. --- DEPENDS | 2 +- Makefile | 4 ++-- PACKAGE-MAINTAINER | 2 +- RELEASE-NOTES-4.0 | 2 +- debian/changelog | 2 +- i3-migrate-config-to-v4.pl => i3-migrate-config-to-v4 | 0 src/cfgparse.y | 8 ++++---- testcases/t/71-config-migrate.t | 4 ++-- 8 files changed, 12 insertions(+), 12 deletions(-) rename i3-migrate-config-to-v4.pl => i3-migrate-config-to-v4 (100%) diff --git a/DEPENDS b/DEPENDS index 71abc3b2..ea7133a5 100644 --- a/DEPENDS +++ b/DEPENDS @@ -35,5 +35,5 @@ All of them are available at CPAN, see http://search.cpan.org/ Use your distribution’s packages or cpan(1) to install them. - i3-migrate-config-to-v4.pl is implemented in Perl, but it has no dependencies + i3-migrate-config-to-v4 is implemented in Perl, but it has no dependencies besides Perl 5.10. diff --git a/Makefile b/Makefile index 7a904320..3bdffbb4 100644 --- a/Makefile +++ b/Makefile @@ -79,7 +79,7 @@ install: all $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3 $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/xsessions $(INSTALL) -m 0755 i3 $(DESTDIR)$(PREFIX)/bin/ - $(INSTALL) -m 0755 i3-migrate-config-to-v4.pl $(DESTDIR)$(PREFIX)/bin/ + $(INSTALL) -m 0755 i3-migrate-config-to-v4 $(DESTDIR)$(PREFIX)/bin/ test -e $(DESTDIR)$(SYSCONFDIR)/i3/config || $(INSTALL) -m 0644 i3.config $(DESTDIR)$(SYSCONFDIR)/i3/config test -e $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes || $(INSTALL) -m 0644 i3.config.keycodes $(DESTDIR)$(SYSCONFDIR)/i3/config.keycodes $(INSTALL) -m 0644 i3.welcome $(DESTDIR)$(SYSCONFDIR)/i3/welcome @@ -93,7 +93,7 @@ dist: distclean [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION} [ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2 mkdir i3-${VERSION} - cp i3-migrate-config-to-v4.pl i3.config.keycodes DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-NOTES-${VERSION} i3.config i3.desktop i3.welcome pseudo-doc.doxygen i3-wsbar Makefile i3-${VERSION} + cp i3-migrate-config-to-v4 i3.config.keycodes DEPENDS GOALS LICENSE PACKAGE-MAINTAINER TODO RELEASE-NOTES-${VERSION} i3.config i3.desktop i3.welcome pseudo-doc.doxygen i3-wsbar Makefile i3-${VERSION} cp -r src i3-msg i3-nagbar i3-config-wizard yajl-fallback include man i3-${VERSION} # Only copy toplevel documentation (important stuff) mkdir i3-${VERSION}/docs diff --git a/PACKAGE-MAINTAINER b/PACKAGE-MAINTAINER index 633b2d7e..3d9a8e18 100644 --- a/PACKAGE-MAINTAINER +++ b/PACKAGE-MAINTAINER @@ -26,7 +26,7 @@ On debian, this looks like this: mkdir -p $(CURDIR)/debian/i3-wm/usr/share/man/man1 cp man/*.1 $(CURDIR)/debian/i3-wm/usr/share/man/man1 -Please make sure that i3-migrate-config-to-v4.pl and i3-config-wizard are +Please make sure that i3-migrate-config-to-v4 and i3-config-wizard are installed with i3. The Perl script is necessary to (automatically) convert v3 configs to v4. The wizard provides the possibility to create a keysym-based config with the user’s preferred modifier and should be started on the first diff --git a/RELEASE-NOTES-4.0 b/RELEASE-NOTES-4.0 index a9a91134..14ecbfa1 100644 --- a/RELEASE-NOTES-4.0 +++ b/RELEASE-NOTES-4.0 @@ -40,7 +40,7 @@ now. • As the configuration file needs new commands (and a few options are obsolete), you need to change it. To make this process a little bit easier - for you, this release comes with the script i3-migrate-config-to-v4.pl. Just + for you, this release comes with the script i3-migrate-config-to-v4. Just run it on your current config file and it will spit out a v4 config file to stdout. To make things even better, i3 automatically detects v3 config files and calls that script, so you never end up with a non-working config :). diff --git a/debian/changelog b/debian/changelog index bfcbc324..aeca9a2b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,7 @@ i3-wm (4.0-1) unstable; urgency=low of all Firefox windows. * As the configuration file needs new commands (and a few options are obsolete), you need to change it. To make this process a little bit easier - for you, this release comes with the script i3-migrate-config-to-v4.pl. Just + for you, this release comes with the script i3-migrate-config-to-v4. Just run it on your current config file and it will spit out a v4 config file to stdout. To make things even better, i3 automatically detects v3 config files and calls that script, so you never end up with a non-working config :). diff --git a/i3-migrate-config-to-v4.pl b/i3-migrate-config-to-v4 similarity index 100% rename from i3-migrate-config-to-v4.pl rename to i3-migrate-config-to-v4 diff --git a/src/cfgparse.y b/src/cfgparse.y index ecfa6658..ae789576 100644 --- a/src/cfgparse.y +++ b/src/cfgparse.y @@ -115,7 +115,7 @@ next: } /* - * Calls i3-migrate-config-to-v4.pl to migrate a configuration file (input + * Calls i3-migrate-config-to-v4 to migrate a configuration file (input * buffer). * * Returns the converted config file or NULL if there was an error (for @@ -153,7 +153,7 @@ static char *migrate_config(char *input, off_t size) { NULL, /* will be replaced by the executable path */ NULL }; - exec_i3_utility("i3-migrate-config-to-v4.pl", argv); + exec_i3_utility("i3-migrate-config-to-v4", argv); } /* parent */ @@ -438,7 +438,7 @@ void parse_file(const char *f) { printf("\n"); printf("Please convert your config file to v4. You can use this command:\n"); printf(" mv %s %s.O\n", f, f); - printf(" i3-migrate-config-to-v4.pl %s.O > %s\n", f, f); + printf(" i3-migrate-config-to-v4 %s.O > %s\n", f, f); printf("****************************************************************\n"); printf("\n"); free(new); @@ -446,7 +446,7 @@ void parse_file(const char *f) { } else { printf("\n"); printf("**********************************************************************\n"); - printf("ERROR: Could not convert config file. Maybe i3-migrate-config-to-v4.pl\n"); + printf("ERROR: Could not convert config file. Maybe i3-migrate-config-to-v4\n"); printf("was not correctly installed on your system?\n"); printf("**********************************************************************\n"); printf("\n"); diff --git a/testcases/t/71-config-migrate.t b/testcases/t/71-config-migrate.t index e93ca9e7..4e97fb27 100644 --- a/testcases/t/71-config-migrate.t +++ b/testcases/t/71-config-migrate.t @@ -2,7 +2,7 @@ # vim:ts=4:sw=4:expandtab # !NO_I3_INSTANCE! will prevent complete-run.pl from starting i3 # -# Tests if i3-migrate-config-to-v4.pl correctly migrates all config file +# Tests if i3-migrate-config-to-v4 correctly migrates all config file # directives and commands # use i3test; @@ -27,7 +27,7 @@ sub migrate_config { print $fh $config; close($fh); - my $cmd = "sh -c 'exec " . abs_path("../i3-migrate-config-to-v4.pl") . " --v3 <$tmpfile'"; + my $cmd = "sh -c 'exec " . abs_path("../i3-migrate-config-to-v4") . " --v3 <$tmpfile'"; return [ split /\n/, qx($cmd) ]; }