Skip to content

Commit

Permalink
chore: Refactoring equals call, usage of deprecated process exec method
Browse files Browse the repository at this point in the history
  • Loading branch information
oppahansi committed Nov 4, 2023
1 parent 31076ef commit ba9a3a3
Show file tree
Hide file tree
Showing 6 changed files with 22 additions and 15 deletions.
2 changes: 1 addition & 1 deletion exercises/src/main/java/intros/Intro1.java
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public static void main(String[] args) {
/* Modify below */

// Make this print out 'Hello, world!'
System.out.println();
System.out.println()

/* Modify above */
}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
1 change: 1 addition & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
22 changes: 13 additions & 9 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -130,26 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
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.
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
# shellcheck disable=SC2039,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
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -198,11 +202,11 @@ 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
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/de/oppa/javalings/Javalings.java
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ private static void watch() throws Exception {
private static void run(String exerciseName) throws Exception {
Exercise exercise;

if (exerciseName.equals(Config.NEXT_OPT)) {
if (exerciseName.equalsIgnoreCase(Config.NEXT_OPT)) {
int nextExerciseIndex = findNextExerciseIndex();
if (nextExerciseIndex >= exercises.size() && exerciseRunner != null) {
System.out.println("All Exercises have been completed. Good job!!");
Expand All @@ -128,7 +128,7 @@ private static void run(String exerciseName) throws Exception {
exercise = findExercise(exerciseName);
}

if (exerciseRunner != null && exerciseName.equals(Config.NEXT_OPT)) {
if (exerciseRunner != null && exerciseName.equalsIgnoreCase(Config.NEXT_OPT)) {
exerciseRunner.stop();
}

Expand Down Expand Up @@ -212,7 +212,7 @@ private static void clear() throws IOException, InterruptedException {
}

private static void reset(String exerciseName) throws IOException, InterruptedException {
if (exerciseName.equals(Config.ALL_OPT)) {
if (exerciseName.equalsIgnoreCase(Config.ALL_OPT)) {
System.out.println("Resetting all exercises..");
reset();
System.out.println("Resetting all exercises done.");
Expand Down Expand Up @@ -268,7 +268,7 @@ private static void verifyOptions(String[] options) {
exitInvalidOptions("Option '%s' not recognised.".formatted(options[0]));
}

if ((options[0].equals(Config.RUN_OPT) || options[0].equals(Config.RESET_OPT)) && options.length == 1) {
if ((options[0].equalsIgnoreCase(Config.RUN_OPT) || options[0].equalsIgnoreCase(Config.RESET_OPT)) && options.length == 1) {
exitInvalidOptions("Sub option for '%s' not provided.".formatted(options[0]));
}

Expand Down
4 changes: 3 additions & 1 deletion src/main/java/de/oppa/javalings/cli/CliRunner.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,9 @@ public static void reset(Exercise exercise) throws IOException, InterruptedExcep
}

public static void resetAll() throws IOException, InterruptedException {
Process process = Runtime.getRuntime().exec(Config.RESET_EXERCISE_CMD.formatted(Config.EXERCISES_JAVA_BASE_PATH));
String[] cmds = Config.RESET_EXERCISE_CMD.formatted(Config.EXERCISES_JAVA_BASE_PATH).split(" ");

Process process = Runtime.getRuntime().exec(cmds);
process.waitFor();
}

Expand Down

0 comments on commit ba9a3a3

Please sign in to comment.