Skip to content

Commit

Permalink
Fix formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
sciencewhiz committed Sep 30, 2024
1 parent 357c7f3 commit 90d5d2a
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
2 changes: 0 additions & 2 deletions files/AdvantageScope.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,3 @@ elif [ "$OS_NAME" = "Darwin" ]; then
else
exec "$AS_PATH/advantagescope-wpilib"
fi


2 changes: 1 addition & 1 deletion files/ScriptBase.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if ! "$JDK_DIR" -jar "$SCRIPT_PATH/$JAR_NAME"; then
if ! "$JAVA_HOME/bin/java" -jar "$SCRIPT_PATH/$JAR_NAME"; then
echo "ERROR launching $SCRIPT_PATH/$JAR_NAME using $JAVA_HOME"
if ! java -jar "$SCRIPT_PATH/$JAR_NAME"; then
echo "ERROR launching $SCRIPT_PATH/$JAR_NAME using java from path: $(which java)"
echo "ERROR launching $SCRIPT_PATH/$JAR_NAME using java from path: $(which java)"
fi
fi
fi
1 change: 0 additions & 1 deletion files/ScriptBaseCpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,3 @@ if [ "$OS_NAME" = "Darwin" ]; then
else
exec "$SCRIPT_PATH/$(echo "$SCRIPT_BASE" | tr '[:upper:]' '[:lower:]')" "$*"
fi

9 changes: 4 additions & 5 deletions scripts/tools.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ ext.toolsSetup = { AbstractArchiveTask zip->
zip.from (scriptBaseFile) {
into '/tools'
}

zip.from (scriptBaseCppFile) {
into '/tools'
}
Expand All @@ -105,7 +105,7 @@ ext.toolsSetup = { AbstractArchiveTask zip->
into '/tools'
fileMode 0755
}

zip.from (scriptBasePythonFile) {
into '/tools'
fileMode 0755
Expand All @@ -115,7 +115,7 @@ ext.toolsSetup = { AbstractArchiveTask zip->
into '/tools'
fileMode 0755
}

zip.from (scriptBaseCppPythonFile) {
into '/tools'
fileMode 0755
Expand All @@ -125,12 +125,11 @@ ext.toolsSetup = { AbstractArchiveTask zip->
into '/tools'
fileMode 0755
}

zip.from (advantageScopeScriptPythonFile) {
into '/tools'
fileMode 0755
}
}


}

0 comments on commit 90d5d2a

Please sign in to comment.