Command (Linux): use /bin/sh as the default shell

This commit is contained in:
李通洲
2023-08-01 10:23:36 +08:00
parent a986edbffb
commit 5562bc6264
4 changed files with 6 additions and 7 deletions
+1
View File
@@ -11,6 +11,7 @@ Changes:
* Remove the special handling of Command module (it can be set once in the triditional `config.conf`). Use JSON config with Command module instead
* Change `--wm-theme-*` to `--wmtheme-*`. Affect `key` and `format`
* Change `--terminal-font-*` to `--terminalfont-*`. Affect `key` and `format`
* Module `Command` uses `/bin/sh` as the default shell on systems other than Windows
Features:
* FreeBSD support is improved greatly, and actually tested in a phycial machine
+1 -1
View File
@@ -692,7 +692,7 @@
"const": "command"
},
"shell": {
"title": "Set the shell program to execute the command text\nDefault: cmd for Windows, csh for FreeBSD, bash for others",
"title": "Set the shell program to execute the command text\nDefault: cmd for Windows, /bin/sh for *nix",
"type": "string"
},
"text": {
+1 -1
View File
@@ -144,7 +144,7 @@ Module specific options:
--weather-output-format: The output weather format to be used. It must be URI encoded.
--player-name: The name of the player to use
--opengl-library <value>: Set the OpenGL context creation library to use. Must be auto, egl, glx or osmesa. Default is auto
--command-shell <str>: Set the shell program to execute the command text. Default is cmd for Windows, csh for FreeBSD, bash for others
--command-shell <str>: Set the shell program to execute the command text. Default is cmd for Windows, /bin/sh for *nix
--command-key <str>: Set the module key to display
--command-text <str>: Set the command text to be executed
--colors-symbol <str>: Set the symbol to be printed by Colors module. Default is block
+3 -5
View File
@@ -39,13 +39,11 @@ void ffInitCommandOptions(FFCommandOptions* options)
options->moduleName = FF_COMMAND_MODULE_NAME;
ffOptionInitModuleArg(&options->moduleArgs);
ffStrbufInitS(&options->shell,
ffStrbufInitStatic(&options->shell,
#ifdef _WIN32
"cmd"
#elif defined(__FreeBSD__)
"csh"
"cmd.exe"
#else
"bash"
"/bin/sh"
#endif
);