Skip to content
This repository has been archived by the owner on Apr 18, 2023. It is now read-only.

Commit

Permalink
i3-migrate-config-to-v4: drop the .pl suffix
Browse files Browse the repository at this point in the history
As lintian (a Debian package checker) mentions, it is more clever to install it
without the extension, since the implementation language might change.
  • Loading branch information
stapelberg committed Jul 31, 2011
1 parent 052b69a commit 3204caa
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion DEPENDS
Expand Up @@ -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.
4 changes: 2 additions & 2 deletions Makefile
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion PACKAGE-MAINTAINER
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion RELEASE-NOTES-4.0
Expand Up @@ -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 :).
Expand Down
2 changes: 1 addition & 1 deletion debian/changelog
Expand Up @@ -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 :).
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions src/cfgparse.y
Expand Up @@ -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
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -438,15 +438,15 @@ 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);
new = converted;
} 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");
Expand Down
4 changes: 2 additions & 2 deletions testcases/t/71-config-migrate.t
Expand Up @@ -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;
Expand All @@ -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) ];
}

Expand Down

0 comments on commit 3204caa

Please sign in to comment.