diff --git a/src/main.rs b/src/main.rs index 5977ee0..57f37f3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -21,7 +21,7 @@ struct Args { #[arg(short, long, default_value_t = 9001)] port: u16, /// The version of the Swim server dependencies. - #[arg(short, long, default_value = "4.0.1")] + #[arg(short, long, default_value = "4.1.0.12")] swim_version: String, } diff --git a/src/utils.rs b/src/utils.rs index bc81a6a..f0061b6 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -4,6 +4,7 @@ use regex::Regex; use serde::Serialize; use std::error::Error; use std::fs; +use std::os::unix::fs::PermissionsExt; use std::path::Path; use tera::Tera; @@ -41,6 +42,25 @@ pub(crate) fn create_file(input_file: &Path, args: &Args) -> Result<(), CliError create_parent_dirs(&output_file)?; + if input_file.display().to_string().ends_with(".jar") { + create_jar_file(input_file, &output_file)?; + } else { + create_regular_file(input_file, &output_file, args)?; + if input_file.display().to_string().ends_with("gradlew") + || input_file.display().to_string().ends_with("gradlew.bat") + { + set_executable_permissions(&output_file)?; + } + } + + Ok(()) +} + +pub(crate) fn create_regular_file( + input_file: &Path, + output_file: &String, + args: &Args, +) -> Result<(), CliError> { let input_file = Templates::get(&input_file.display().to_string()) .ok_or(CliError::missing_file_err(output_file.clone()))?; @@ -50,9 +70,24 @@ pub(crate) fn create_file(input_file: &Path, args: &Args) -> Result<(), CliError let output_text = replace_text(&input_text, args) .map_err(|err| CliError::create_file_err(output_file.clone(), err.to_string()))?; - fs::write(&output_file, output_text) - .map_err(|err| CliError::create_file_err(output_file, err.kind().to_string()))?; + fs::write(output_file, output_text) + .map_err(|err| CliError::create_file_err(output_file.clone(), err.kind().to_string()))?; + + Ok(()) +} + +pub(crate) fn create_jar_file(input_file: &Path, output_file: &String) -> Result<(), CliError> { + let input_file = Templates::get(&input_file.display().to_string()) + .ok_or(CliError::missing_file_err(output_file.clone()))?; + + fs::write(output_file, input_file.data) + .map_err(|err| CliError::create_file_err(output_file.clone(), err.kind().to_string()))?; + + Ok(()) +} +pub(crate) fn set_executable_permissions(output_file: &String) -> Result<(), CliError> { + fs::set_permissions(output_file, fs::Permissions::from_mode(0o755)).unwrap(); Ok(()) } diff --git a/templates/swim-template/.gitignore b/templates/swim-template/.gitignore index 0648b52..1f94fa7 100644 --- a/templates/swim-template/.gitignore +++ b/templates/swim-template/.gitignore @@ -1,4 +1,3 @@ .idea .gradle -gradle build diff --git a/templates/swim-template/gradle/wrapper/gradle-wrapper.jar b/templates/swim-template/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..033e24c Binary files /dev/null and b/templates/swim-template/gradle/wrapper/gradle-wrapper.jar differ diff --git a/templates/swim-template/gradle/wrapper/gradle-wrapper.properties b/templates/swim-template/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..62f495d --- /dev/null +++ b/templates/swim-template/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/templates/swim-template/gradlew b/templates/swim-template/gradlew index fcb6fca..1b6c787 100755 --- a/templates/swim-template/gradlew +++ b/templates/swim-template/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/. @@ -80,11 +80,14 @@ do esac done -# This is normally unused -# shellcheck disable=SC2034 -APP_BASE_NAME=${0##*/} APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit +APP_NAME="Gradle" +APP_BASE_NAME=${0##*/} + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -130,29 +133,22 @@ location of your Java installation." fi else JAVACMD=java - if ! command -v java >/dev/null 2>&1 - then - die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the location of your Java installation." - fi fi # Increase the maximum file descriptors if we can. if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then case $MAX_FD in #( max*) - # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 MAX_FD=$( ulimit -H -n ) || warn "Could not query maximum file descriptor limit" esac case $MAX_FD in #( '' | soft) :;; #( *) - # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. - # shellcheck disable=SC3045 ulimit -n "$MAX_FD" || warn "Could not set maximum file descriptor limit to $MAX_FD" esac @@ -197,10 +193,6 @@ if "$cygwin" || "$msys" ; then done fi - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' - # Collect all arguments for the java command; # * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of # shell script including quotes and variable substitutions, so put them in @@ -213,12 +205,6 @@ set -- \ org.gradle.wrapper.GradleWrapperMain \ "$@" -# Stop when "xargs" is not available. -if ! command -v xargs >/dev/null 2>&1 -then - die "xargs is not available" -fi - # Use "xargs" to parse quoted args. # # With -n1 it outputs one arg per line, with the quotes and backslashes removed. diff --git a/templates/swim-template/gradlew.bat b/templates/swim-template/gradlew.bat index 6689b85..ac1b06f 100644 --- a/templates/swim-template/gradlew.bat +++ b/templates/swim-template/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%"=="" @echo off +@if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,8 +25,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused +if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -41,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -76,15 +75,13 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd +if "%ERRORLEVEL%"=="0" goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 :mainEnd if "%OS%"=="Windows_NT" endlocal