mirror of
				https://github.com/cmderdev/cmder.git
				synced 2025-10-31 17:32:27 +08:00 
			
		
		
		
	Fixed som misc stuff and prevented multi runs
This commit is contained in:
		
							
								
								
									
										13
									
								
								vendor/cmder_exinit
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										13
									
								
								vendor/cmder_exinit
									
									
									
									
										vendored
									
									
								
							| @@ -19,14 +19,23 @@ | |||||||
| # Add system specific users customizations to $HOME/.bashrc, these  | # Add system specific users customizations to $HOME/.bashrc, these  | ||||||
| # customizations will not follow Cmder to another machine. | # customizations will not follow Cmder to another machine. | ||||||
|  |  | ||||||
|  | # Check that we haven't already been sourced. | ||||||
|  | [[ -z ${CMDER_EXINIT} ]] && CMDER_EXINIT="1" || return | ||||||
|  |  | ||||||
| # We do this for bash as admin sessions since $CMDER_ROOT is not being set | # We do this for bash as admin sessions since $CMDER_ROOT is not being set | ||||||
| if [ "$CMDER_ROOT" = "" -a "$ConEmuDir" != "" ] ; then | if [ "$CMDER_ROOT" = "" -a "$ConEmuDir" != "" ] ; then | ||||||
|   case "$ConEmuDir" in *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." ; pwd );; esac |   case "$ConEmuDir" in *\\*) CMDER_ROOT=$( cd "$(cygpath -u "$ConEmuDir")/../.." ; pwd );; esac | ||||||
|  |   if [ !-d $CMDER_ROOT/vendor ] ; then | ||||||
|  |     echo "Running in ConEmu without Cmder, skipping Cmder integration." | ||||||
|  |     return | ||||||
|  |   fi | ||||||
| elif [ "$CMDER_ROOT" != "" ] ; then | elif [ "$CMDER_ROOT" != "" ] ; then | ||||||
|   case "$CMDER_ROOT" in *\\*) CMDER_ROOT="$(cygpath -u "$CMDER_ROOT")";; esac |   case "$CMDER_ROOT" in *\\*) CMDER_ROOT="$(cygpath -u "$CMDER_ROOT")";; esac | ||||||
| else | else | ||||||
|   break # This is a HACK to exit this script without exiting all running scripts. |   return | ||||||
| fi >/dev/null 2>&1 # This prevents showing errors when the above HACK happens. | fi | ||||||
|  |  | ||||||
|  | echo "Using \"CMDER_ROOT\" at \"${CMDER_ROOT}\"...\n" | ||||||
|  |  | ||||||
| # Remove any trailing '/' | # Remove any trailing '/' | ||||||
| CMDER_ROOT=$(echo $CMDER_ROOT | sed 's:/*$::') | CMDER_ROOT=$(echo $CMDER_ROOT | sed 's:/*$::') | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user