mirror of https://github.com/sbt/sbt.git
Merge pull request #217 from dkim/sbt-create
Exit if the current dir is definitely not an sbt dir and neither `-sbt-create` nor `new` was given
This commit is contained in:
commit
92067eb308
|
|
@ -127,12 +127,31 @@ process_my_args () {
|
|||
|
||||
-sbt-create) sbt_create=true && shift ;;
|
||||
|
||||
new) sbt_new=true && addResidual "$1" && shift ;;
|
||||
|
||||
*) addResidual "$1" && shift ;;
|
||||
esac
|
||||
done
|
||||
|
||||
# Now, ensure sbt version is used.
|
||||
[[ "${sbt_version}XXX" != "XXX" ]] && addJava "-Dsbt.version=$sbt_version"
|
||||
|
||||
# Confirm a user's intent if the current directory does not look like an sbt
|
||||
# top-level directory and neither the -sbt-create option nor the "new"
|
||||
# command was given.
|
||||
[[ -f ./build.sbt || -d ./project || -n "$sbt_create" || -n "$sbt_new" ]] || {
|
||||
echo "[warn] Neither build.sbt nor a 'project' directory in the current directory: $(pwd)"
|
||||
while true; do
|
||||
echo 'c) continue'
|
||||
echo 'q) quit'
|
||||
|
||||
read -p '? ' || exit 1
|
||||
case "$REPLY" in
|
||||
c|C) break ;;
|
||||
q|Q) exit 1 ;;
|
||||
esac
|
||||
done
|
||||
}
|
||||
}
|
||||
|
||||
loadConfigFile() {
|
||||
|
|
|
|||
|
|
@ -68,6 +68,9 @@ if "%~1" == "-jvm-debug" (
|
|||
if not "%~1" == "!JVM_DEBUG_PORT!" (
|
||||
set SBT_ARGS=!SBT_ARGS! %1
|
||||
)
|
||||
) else if /I "%~1" == "new" (
|
||||
set sbt_new=true
|
||||
set SBT_ARGS=!SBT_ARGS! %1
|
||||
) else (
|
||||
set SBT_ARGS=!SBT_ARGS! %1
|
||||
)
|
||||
|
|
@ -76,6 +79,31 @@ shift
|
|||
goto args_loop
|
||||
:args_end
|
||||
|
||||
rem Confirm a user's intent if the current directory does not look like an sbt
|
||||
rem top-level directory and the "new" command was not given.
|
||||
if not exist build.sbt (
|
||||
if not exist project\ (
|
||||
if not defined sbt_new (
|
||||
echo [warn] Neither build.sbt nor a 'project' directory in the current directory: %CD%
|
||||
setlocal
|
||||
:confirm
|
||||
echo c^) continue
|
||||
echo q^) quit
|
||||
|
||||
set /P reply=?^
|
||||
if /I "!reply!" == "c" (
|
||||
goto confirm_end
|
||||
) else if /I "!reply!" == "q" (
|
||||
exit /B 1
|
||||
)
|
||||
|
||||
goto confirm
|
||||
:confirm_end
|
||||
endlocal
|
||||
)
|
||||
)
|
||||
)
|
||||
|
||||
if defined JVM_DEBUG_PORT (
|
||||
set _JAVA_OPTS=!_JAVA_OPTS! -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=!JVM_DEBUG_PORT!
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue