Merge pull request #737 from JanSchulz/user-profile

Use consistent naming: user-profile.{sh|bat|ps1}
This commit is contained in:
Martin Kemp 2015-11-25 10:01:18 +00:00
commit 3595d3e7fc
2 changed files with 10 additions and 10 deletions

10
vendor/cmder.sh vendored
View File

@ -1,6 +1,6 @@
# DO NOT EDIT THIS FILE IT WILL BE OVERWRITTEN ON UPDATE # DO NOT EDIT THIS FILE IT WILL BE OVERWRITTEN ON UPDATE
# #
# Add portable user customizations ${CMDER_ROOT}/config/user-cmder.sh, # Add portable user customizations ${CMDER_ROOT}/config/user-profile.sh,
# these customizations will follow Cmder if $CMDER_ROOT is copied # these customizations will follow Cmder if $CMDER_ROOT is copied
# to another machine. # to another machine.
# #
@ -35,11 +35,11 @@ PATH=${CMDER_ROOT}/bin:$PATH:${CMDER_ROOT}
export PATH export PATH
if [ -f ${CMDER_ROOT}/config/user-cmder.sh ] ; then if [ -f ${CMDER_ROOT}/config/user-profile.sh ] ; then
. ${CMDER_ROOT}/config/user-cmder.sh . ${CMDER_ROOT}/config/user-profile.sh
else else
echo Creating user startup file: "${CMDER_ROOT}/config/user-cmder.sh" echo Creating user startup file: "${CMDER_ROOT}/config/user-profile.sh"
cat <<-eof >"${CMDER_ROOT}/config/user-cmder.sh" cat <<-eof >"${CMDER_ROOT}/config/user-profile.sh"
# use this file to run your own startup commands for msys2 bash' # use this file to run your own startup commands for msys2 bash'
# To add a new vendor to the path, do something like: # To add a new vendor to the path, do something like:

10
vendor/init.bat vendored
View File

@ -2,7 +2,7 @@
:: Created as part of cmder project :: Created as part of cmder project
:: !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED :: !!! THIS FILE IS OVERWRITTEN WHEN CMDER IS UPDATED
:: !!! Use "%CMDER_ROOT%\config\user-startup.cmd" to add your own startup commands :: !!! Use "%CMDER_ROOT%\config\user-profile.cmd" to add your own startup commands
:: Find root dir :: Find root dir
@if not defined CMDER_ROOT ( @if not defined CMDER_ROOT (
@ -84,11 +84,11 @@
) )
) )
@if exist "%CMDER_ROOT%\config\user-startup.cmd" ( @if exist "%CMDER_ROOT%\config\user-profile.cmd" (
@rem create this file and place your own command in there @rem create this file and place your own command in there
call "%CMDER_ROOT%\config\user-startup.cmd" call "%CMDER_ROOT%\config\user-profile.cmd"
) else ( ) else (
@echo Creating user startup file: "%CMDER_ROOT%\config\user-startup.cmd" @echo Creating user startup file: "%CMDER_ROOT%\config\user-profile.cmd"
( (
@echo :: use this file to run your own startup commands @echo :: use this file to run your own startup commands
@echo :: use @ in front of the command to prevent printing the command @echo :: use @ in front of the command to prevent printing the command
@ -96,5 +96,5 @@
@echo :: @call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd @echo :: @call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd
@echo :: @set PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%% @echo :: @set PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%%
@echo. @echo.
) > "%CMDER_ROOT%\config\user-startup.cmd" ) > "%CMDER_ROOT%\config\user-profile.cmd"
) )