Merge pull request #737 from JanSchulz/user-profile

Use consistent naming: user-profile.{sh|bat|ps1}
cmderdev · Nov 25, 2015 · 3595d3e · 3595d3e
2 parents 05c6f1c + 854cadb
commit 3595d3e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/vendor/cmder.sh b/vendor/cmder.sh
@@ -1,6 +1,6 @@
 # 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
 # to another machine.
 #
@@ -35,11 +35,11 @@ PATH=${CMDER_ROOT}/bin:$PATH:${CMDER_ROOT}
 
 export PATH
 
-if [ -f ${CMDER_ROOT}/config/user-cmder.sh ] ; then
-    . ${CMDER_ROOT}/config/user-cmder.sh
+if [ -f ${CMDER_ROOT}/config/user-profile.sh ] ; then
+    . ${CMDER_ROOT}/config/user-profile.sh
 else
-    echo Creating user startup file: "${CMDER_ROOT}/config/user-cmder.sh"
-    cat <<-eof >"${CMDER_ROOT}/config/user-cmder.sh"
+    echo Creating user startup file: "${CMDER_ROOT}/config/user-profile.sh"
+    cat <<-eof >"${CMDER_ROOT}/config/user-profile.sh"
 # use this file to run your own startup commands for msys2 bash'
 
 # To add a new vendor to the path, do something like:

diff --git a/vendor/init.bat b/vendor/init.bat
@@ -2,7 +2,7 @@
 :: Created as part of cmder project
 
 :: !!! 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
 @if not defined CMDER_ROOT (
@@ -84,17 +84,17 @@
     )
 )
 
-@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
-    call "%CMDER_ROOT%\config\user-startup.cmd"
+    call "%CMDER_ROOT%\config\user-profile.cmd"
 ) 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 @ in front of the command to prevent printing the command
     @echo.
     @echo :: @call "%%GIT_INSTALL_ROOT%%/cmd/start-ssh-agent.cmd
     @echo :: @set PATH=%%CMDER_ROOT%%\vendor\whatever;%%PATH%%
     @echo.
-    ) > "%CMDER_ROOT%\config\user-startup.cmd"
+    ) > "%CMDER_ROOT%\config\user-profile.cmd"
 )