Release v1.0

Set mintty window title (especially nice when a custom command is executed)
Finally fix command execution
2020-05-30 09:42:51 +02:00 · 2016-08-01 20:50:12 +02:00 · 2016-08-01 20:49:14 +02:00 · 2016-06-06 16:34:19 +02:00 · 2016-05-21 22:28:33 +02:00 · 2016-03-30 14:56:50 +02:00
11 changed files with 61 additions and 61 deletions
--- a/.editorconfig
+++ b/.editorconfig
@@ -0,0 +1,4 @@
+root = true
+
+[*.{c,h,rc}]
+indent_style = tab
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,7 @@
-/mingw32.exe
-/mingw32.res
-/mingw32.ini
-/mingw64.exe
-/mingw64.res
-/mingw64.ini
-/msys2.exe
-/msys2.res
-/msys2.ini
-/cygwin.exe
-/cygwin.res
-/cygwin.ini
-/pkg/
-/src/
+/*.exe
+/*.res
+/*.ini
 /*.pkg.tar.xz
 /*.pkg.tar.xz.sig
+/pkg/
+/src/
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,6 +1,6 @@
 The MIT License (MIT)

-Copyright (c) <year> <copyright holders>
+Copyright (c) 2015 David Macek

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/26
+++ b/26
@@ -1,39 +1,29 @@
 PREFIX=

-msys2: msys2.exe msys2.ini mingw32.exe mingw32.ini mingw64.exe mingw64.ini
-cygwin: cygwin.exe cygwin.ini
-all: msys2 cygwin
+all: msys2.exe msys2.ini mingw32.exe mingw32.ini mingw64.exe mingw64.ini

-.PHONY: all msys2 cygwin
+.PHONY: all

 msys2.ini: launcher.ini
 	cp -f $^ $@
 	echo MSYSTEM=MSYS>> $@
 msys2.res: launcher.rc msys2.ico
-	$(PREFIX)windres -O COFF -o $@ $< -DPRODUCT=MSYS2 -DMSYSTEM=MSYS -DICONFILE=msys2.ico
+	$(PREFIX)windres -O COFF -o $@ $< -DMSYSTEM=MSYS -DICONFILE=msys2.ico
 msys2.exe: launcher.c msys2.res
-	$(PREFIX)gcc -std=c11 -Wall -Wextra -Werror -static -municode -mwindows -o $@ $^ -DPRODUCT=MSYS2 -DSHELLPATH='usr\\bin\\mintty.exe'
+	$(PREFIX)gcc -std=c11 -Wall -Wextra -Werror -static -municode -mwindows -o $@ $^

 mingw32.ini: launcher.ini
 	cp -f $^ $@
 	echo MSYSTEM=MINGW32>> $@
 mingw32.res: launcher.rc mingw32.ico
-	$(PREFIX)windres -O COFF -o $@ $< -DPRODUCT=MSYS2 -DMSYSTEM=MINGW32 -DICONFILE=mingw32.ico
+	$(PREFIX)windres -O COFF -o $@ $< -DMSYSTEM=MINGW32 -DICONFILE=mingw32.ico
 mingw32.exe: launcher.c mingw32.res
-	$(PREFIX)gcc -std=c11 -Wall -Wextra -Werror -static -municode -mwindows -o $@ $^ -DPRODUCT=MSYS2 -DSHELLPATH='usr\\bin\\mintty.exe'
+	$(PREFIX)gcc -std=c11 -Wall -Wextra -Werror -static -municode -mwindows -o $@ $^

 mingw64.ini: launcher.ini
 	cp -f $^ $@
 	echo MSYSTEM=MINGW64>> $@
 mingw64.res: launcher.rc mingw64.ico
-	$(PREFIX)windres -O COFF -o $@ $< -DPRODUCT=MSYS2 -DMSYSTEM=MINGW64 -DICONFILE=mingw64.ico
+	$(PREFIX)windres -O COFF -o $@ $< -DMSYSTEM=MINGW64 -DICONFILE=mingw64.ico
 mingw64.exe: launcher.c mingw64.res
-	$(PREFIX)gcc -std=c11 -Wall -Wextra -Werror -static -municode -mwindows -o $@ $^ -DPRODUCT=MSYS2 -DSHELLPATH='usr\\bin\\mintty.exe'
-
-cygwin.ini: launcher.ini
-	cp -f $^ $@
-	echo MSYSTEM=CYGWIN>> $@
-cygwin.res: launcher.rc cygwin.ico
-	$(PREFIX)windres -O COFF -o $@ $< -DPRODUCT=Cygwin -DMSYSTEM=CYGWIN -DICONFILE=cygwin.ico
-cygwin.exe: launcher.c cygwin.res
-	$(PREFIX)gcc -std=c11 -Wall -Wextra -Werror -static -municode -mwindows -o $@ $^ -DPRODUCT=Cygwin -DSHELLPATH='bin\\mintty.exe'
+	$(PREFIX)gcc -std=c11 -Wall -Wextra -Werror -static -municode -mwindows -o $@ $^
--- a/20
+++ b/20
@@ -1,6 +1,6 @@
 _realname="msys2-launcher"
 pkgname=("${_realname}-git")
-pkgver=0.3.17.1a1c586
+pkgver=1.0
 pkgrel=1
 pkgdesc="Helper for launching MSYS2 shells"
 arch=('x86_64' 'i686')
@@ -11,15 +11,15 @@ conflicts=("${_realname}")
 depends=("mintty>=2.2.1")
 makedepends=('mingw-w64-cross-gcc')
 source=(launcher.{c,ini,rc} {macros,version}.h Makefile {mingw32,mingw64,msys2}.ico)
-md5sums=('e21db11d21f95aab30966a8c528efd9b'
-         '7ab96cb34fef046e4839e270f9397a32'
-         '3a3c9fd8d083716e5efd759641eb4f31'
-         '57a40ae9972dac94df0830a1ab480895'
-         'fef245f65b6826502b953b81fb397d97'
-         '8d3fa1f8eb06343a13b72299c164f6cd'
-         '797a8ea3012b22705caadcb17b1291c2'
-         '0237b204a9d09dcadc955b435cefd311'
-         '292ad5cdd78abac9d694cc06819a96fc')
+sha512sums=('eac22e62609e06a49931f70b12abaf0f1a412a98bcf349a2b6a0738b511d05ed7ce7731d2e30f9510926c3175d3521d0164e25cd70e9b18ba33aeb887deef11e'
+            '5ed8a2e9997d9d2c1e17940292d68542f897e2716b274741d8a3ba7c8f46235c175b7e0a1252a879ba3c79b571504d25de2a8d6b004aedd117d263195bc2b185'
+            'cf257f1f5b7fc69a32c63fe5bf5299db078621850b1e12358654d71da7777a94a0668d657c1834be308db099cad9d48a42fa7877ad58dfdbd576248150913a12'
+            '6019ca0d67375c1261dda0d54d45fc411b02244c51b71d5c57d2613e9edfb4e8f9000754e5c7d632ed0101005c01cd0a98c3961d5b5f51c94d83eceba4296d35'
+            '2e2669db2e8ef54ff6859f4e9a2657f867aef89094f29386da6df6a39931b55927bd16f92a5058fb4aecc5705a2bf3a867172740bc53bca560b98820790ad3c9'
+            '270db9d92b944754cc71523053532473d8a477241725e7aded02dc34d35895a33cf135be7a87692c0f9d2204731e345b8ae82d33f15a1a197e73357552c564e0'
+            '27b9591fa286a15b0eb76a381191f025184d545359285215b9958632a5bce99484de0130296ff4b285e38cec9d88299c09b2ce1fe4b4957b4ef295d31a620817'
+            'b1ecd3def00a023a9e88806ff9bbb1bbd73086fbf7554799eb5fe8adb16bf96ed1a7da375bb2b9f9268fcf08e25dab4414bb4888e1ee6eff4587ee0973374f6f'
+            '7f369b102391eba9ab56e1fb2157f820ecce41434b7232137da32b924b2d53840731e18ef80916703effc6770e862d1fee2986e66c1d03a8c8bb3feef4f08d58')

 pkgver() {
  local _major=$(cat version.h | grep -F 'VER_MAJOR' | head -1 | sed -e 's/.* //')
--- a/README.md
+++ b/README.md
@@ -6,4 +6,18 @@ A helper for launching MSYS2 shells. Features blink-less launching and correct t
 Installation
 ------------

-Just `make` and put the executables inside your MSYS2 root. Needs mintty v2.1.6 or newer (unreleased at the time of writing).
+Just `make` and put the .exe and .ini files inside your MSYS2 root. Needs mintty v2.1.6 or newer.
+
+Configuration
+-------------
+
+All three default launchers are the same (except for embedded icons and descriptions) and are configured by corresponding .ini files. The .ini file has to be in the same directory as the .exe file and have the same filename (except for the `.exe` -> `.ini` change).
+
+By default, only `MSYSTEM` is set, but options for inheriting `PATH` and tweaking `MSYS` are prepared, as well as `CHERE_INVOKING` for the shell to stay in the current working directory (instead of changing to the home directory).
+
+The .ini file contains environment variables, each on a separate line, in the usual `VAR=val` format. Lines starting with `#` are ignored. The values are expanded using the current environment (use Windows `%var%` syntax).
+
+Pinning
+-------
+
+As with many other applications, the correct way to pin a shortcut to the taskbar is by right-clicking the button of a running MSYS2 shell (started by this launcher) on the taskbar and choosing "Pin this program to taskbar". Pinning the `.exe` file itself won't create the shortcut correctly. There are tools to diagnose and fix such a situation (7+ Taskbar Tweaker and Win7AppId) in case re-pinning is not preferred.
--- a/cygwin.ico
+++ b/cygwin.ico
--- a/launcher.c
+++ b/launcher.c
@@ -7,6 +7,7 @@
 #include <stdbool.h>
 #include <stdio.h>
 #include <wchar.h>
+int _CRT_glob = 0;

 #include "macros.h"

@@ -224,7 +225,7 @@ int wmain(int argc, wchar_t* argv[]) {
 			ShowError(L"Could not allocate memory", L"", 0);
 			return __LINE__;
 		}
-		code = swprintf(buf, buflen, L"%s\\%s -i '%s' -o 'AppLaunchCmd=%s' -o 'AppID=%s.Shell.%s.%d' -o 'AppName=%s %s Shell' --store-taskbar-properties -- /usr/bin/bash --login %s %s", msysdir, STRINGIFY_W(SHELLPATH), exepath, exepath, STRINGIFY_W(PRODUCT), msystem, APPID_REVISION, STRINGIFY_W(PRODUCT), msystem, argc == 1 ? L"-i" : L"-c '$0 \"$@\"'", args);
+		code = swprintf(buf, buflen, L"%s\\usr\\bin\\mintty.exe -i '%s' -o 'AppLaunchCmd=%s' -o 'AppID=MSYS2.Shell.%s.%d' -o 'AppName=MSYS2 %s Shell' -t 'MSYS2 %s Shell' --store-taskbar-properties -- %s %s", msysdir, exepath, exepath, msystem, APPID_REVISION, msystem, msystem, argc == 1 ? L"-" : L"/usr/bin/sh -lc '\"$@\"' sh", args);
 		buflen *= 2;
 	}
 	if (code < 0) {
--- a/launcher.ini
+++ b/launcher.ini
@@ -1,4 +1,4 @@
 #MSYS=winsymlinks:nativestrict
 #MSYS=error_start:mingw64/bin/qtcreator.exe|-debug|<process-id>
 #CHERE_INVOKING=1
-#PATH=%SystemRoot%\System32;%SystemRoot%;%SystemRoot%\System32\Wbem
+#MSYS2_PATH_TYPE=inherit
--- a/launcher.rc
+++ b/launcher.rc
@@ -4,20 +4,20 @@
 1 VERSIONINFO
 FILEVERSION     VER_MAJOR,VER_MINOR,0,0
 BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "040904E4"
-    BEGIN
-      VALUE "ProductName", STRINGIFY_A(PRODUCT)
-      VALUE "FileDescription", STRINGIFY_A(PRODUCT) " " STRINGIFY_A(MSYSTEM) " shell launcher"
-      VALUE "FileVersion", STRINGIFY_A(VER_MAJOR) "." STRINGIFY_A(VER_MINOR)
-    END
-  END
+	BLOCK "StringFileInfo"
+	BEGIN
+		BLOCK "040904E4"
+		BEGIN
+			VALUE "ProductName", "MSYS2"
+			VALUE "FileDescription", "MSYS2 " STRINGIFY_A(MSYSTEM) " shell launcher"
+			VALUE "FileVersion", STRINGIFY_A(VER_MAJOR) "." STRINGIFY_A(VER_MINOR)
+		END
+	END

-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x409, 1252
-  END
+	BLOCK "VarFileInfo"
+	BEGIN
+		VALUE "Translation", 0x409, 1252
+	END
 END

 id ICON STRINGIFY_A(ICONFILE)
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #ifndef M2L_VERSION_H
 #define M2L_VERSION_H

-#define VER_MAJOR  0
-#define VER_MINOR  3
+#define VER_MAJOR  1
+#define VER_MINOR  0

 #endif
Author	SHA1	Message	Date
David Macek	71fc2d43b7	Release v1.0	2020-05-30 09:42:51 +02:00
David Macek	56c2ba79fc	Set mintty window title (especially nice when a custom command is executed)	2016-08-01 20:50:12 +02:00
David Macek	f3d1abf153	Finally fix command execution	2016-08-01 20:49:14 +02:00
David Macek	d8c2c9eb69	Document the pinning procedure	2016-06-06 16:34:19 +02:00
David Macek	4028b6cae0	Replace `PATH` line with `MSYS2_PATH_TYPE` line in example config	2016-05-21 22:28:33 +02:00
David Macek	860c495002	Add entry for PowerShell to PATH To match MSYS2 recent `/etc/profile` changes, an entry for PowerShell is added to the `PATH` line in `launcher.ini`.	2016-03-30 14:56:50 +02:00
David Macek	b71e7e3674	Respect the user's login shell (fixes #3 ) The launcher only specifies "-" as the command and mintty automatically launches the login shell correctly. This can't work if the launcher needs to pass additional arguments to the shell (such as `-c "shell command"`), so `sh` is used as a fallback in that case.	2016-03-19 18:46:53 +01:00
David Macek	6f75d2b3e9	Turn off mingw globbing I don't see any real effect it had on the launcher's functions, but turning it off seems more correct.	2016-03-19 18:32:58 +01:00
David Macek	3bb62c7089	Simplify and generalize .gitignore	2016-03-19 17:58:14 +01:00
David Macek	bc7e470429	Fill in copyright information in LICENSE.md	2016-03-19 17:58:14 +01:00
David Macek	92cb91db1b	Switch to SHA512 in PKGBUILD	2016-03-19 17:58:14 +01:00
David Macek	2716832118	Fix formatting in launcher.rc	2016-03-19 17:58:14 +01:00
Liam Bowen	b81f4dd5e3	Add .editorconfig to use tabs	2016-03-19 17:58:14 +01:00
David Macek	e09bbea607	Update README.md to mention .ini files; remove note about unreleased mintty (fixes #2 )	2016-03-19 17:58:13 +01:00
David Macek	430f154584	Replace icons with prettier ones	2016-03-19 17:50:26 +01:00