nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Michael Stapelberg 2011-07-31 23:11:05 +02:00
parent 052b69a4bf
commit 3204caa98d
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPENDS
View File

@ -35,5 +35,5 @@
All of them are available at CPAN, see http://search.cpan.org/ All of them are available at CPAN, see http://search.cpan.org/
Use your distribution’s packages or cpan(1) to install them. 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. besides Perl 5.10.

4
Makefile
View File

@ -79,7 +79,7 @@ install: all
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3 $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/include/i3
$(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/xsessions $(INSTALL) -d -m 0755 $(DESTDIR)$(PREFIX)/share/xsessions
$(INSTALL) -m 0755 i3 $(DESTDIR)$(PREFIX)/bin/ $(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 || $(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 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 $(INSTALL) -m 0644 i3.welcome $(DESTDIR)$(SYSCONFDIR)/i3/welcome
@ -93,7 +93,7 @@ dist: distclean
[ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION} [ ! -d i3-${VERSION} ] || rm -rf i3-${VERSION}
[ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2 [ ! -e i3-${VERSION}.tar.bz2 ] || rm i3-${VERSION}.tar.bz2
mkdir i3-${VERSION} 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} cp -r src i3-msg i3-nagbar i3-config-wizard yajl-fallback include man i3-${VERSION}
# Only copy toplevel documentation (important stuff) # Only copy toplevel documentation (important stuff)
mkdir i3-${VERSION}/docs mkdir i3-${VERSION}/docs

2
PACKAGE-MAINTAINER
View File

@ -26,7 +26,7 @@ On debian, this looks like this:
mkdir -p $(CURDIR)/debian/i3-wm/usr/share/man/man1 mkdir -p $(CURDIR)/debian/i3-wm/usr/share/man/man1
cp man/*.1 $(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 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 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 config with the user’s preferred modifier and should be started on the first

2
RELEASE-NOTES-4.0
View File

@ -40,7 +40,7 @@ now.
• As the configuration file needs new commands (and a few options are • 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 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 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 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 :). and calls that script, so you never end up with a non-working config :).

2
debian/changelog vendored
View File

@ -14,7 +14,7 @@ i3-wm (4.0-1) unstable; urgency=low
of all Firefox windows. of all Firefox windows.
* As the configuration file needs new commands (and a few options are * 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 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 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 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 :). and calls that script, so you never end up with a non-working config :).

0
i3-migrate-config-to-v4.pl → i3-migrate-config-to-v4
View File

8
src/cfgparse.y
View File

@ -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). * buffer).
* *
* Returns the converted config file or NULL if there was an error (for * 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, /* will be replaced by the executable path */
NULL NULL
}; };
exec_i3_utility("i3-migrate-config-to-v4.pl", argv); exec_i3_utility("i3-migrate-config-to-v4", argv);
} }
/* parent */ /* parent */
@ -438,7 +438,7 @@ void parse_file(const char *f) {
printf("\n"); printf("\n");
printf("Please convert your config file to v4. You can use this command:\n"); printf("Please convert your config file to v4. You can use this command:\n");
printf(" mv %s %s.O\n", f, f); 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");
printf("\n"); printf("\n");
free(new); free(new);
@ -446,7 +446,7 @@ void parse_file(const char *f) {
} else { } else {
printf("\n"); printf("\n");
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("was not correctly installed on your system?\n");
printf("**********************************************************************\n"); printf("**********************************************************************\n");
printf("\n"); printf("\n");

4
testcases/t/71-config-migrate.t
View File

@ -2,7 +2,7 @@
# vim:ts=4:sw=4:expandtab # vim:ts=4:sw=4:expandtab
# !NO_I3_INSTANCE! will prevent complete-run.pl from starting i3 # !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 # directives and commands
# #
use i3test; use i3test;
@ -27,7 +27,7 @@ sub migrate_config {
print $fh $config; print $fh $config;
close($fh); 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) ]; return [ split /\n/, qx($cmd) ];
} }