Skip to content

Commit 5853f06

Browse files
committed
remove submodules
1 parent 88c41da commit 5853f06

12 files changed

+61
-63
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
/libs

.gitmodules

Lines changed: 0 additions & 12 deletions
This file was deleted.

ccPackage.lua

Lines changed: 0 additions & 10 deletions
This file was deleted.

fetch-deps.sh

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
#!/bin/bash
2+
3+
# ---- Whats happening ---- #
4+
5+
# This fetches the dependencies listed in the "libs" variable and saves them in the targetFolder
6+
7+
set -e
8+
9+
libs=(
10+
"TestSuite-lib"
11+
"TurtleEmulator-lib"
12+
"scanner-lib"
13+
"turtleController-lib"
14+
"ccClass-lib"
15+
"miningClient-lib"
16+
"helperFunctions-lib"
17+
"eventHandler-lib"
18+
)
19+
20+
# Basic setup variables
21+
repo="mc-cc-scripts"
22+
branch="master"
23+
targetFolderName=libs
24+
25+
26+
# fetch files.txt and save each file into the targetFolder
27+
fetch() {
28+
files_txt=$(curl -fsSL "https://github.com/$repo/$1/$branch/files.txt")
29+
if [ -z "$files_txt" ]; then
30+
echo "Could not load files.txt for $1"
31+
exit 1
32+
fi
33+
while IFS= read -r FILE; do
34+
url="https://github.com/$repo/$1/$branch/$FILE"
35+
36+
mkdir -p "$(dirname "$targetFolderName/$FILE")" # create the folder (and subfolders specified in the files.txt)
37+
rm -f $targetFolderName/$FILE.lua # rm existing file
38+
if ! curl -s -o "$targetFolderName/$FILE" "$url"; then
39+
echo "could not get / write the file $i: '$FILE' to the folder '$targetFolderName'"
40+
exit 1
41+
fi
42+
# echo "saved $1: '$FILE' in '$targetFolderName'"
43+
done < <(echo "$files_txt")
44+
}
45+
46+
if [[ $# -eq 0 ]]; then
47+
# No arguments given, fetch all
48+
for i in "${libs[@]}"; do
49+
fetch "$i"
50+
done
51+
else
52+
# Argument given, fetch arguemt
53+
fetch "$1"
54+
fi

libs/miningClient-lib

Lines changed: 0 additions & 1 deletion
This file was deleted.

miningClientSmall.lua

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
---@class scm
22
local scm = require("scm")
3-
---@class SettingManager
4-
local sM = scm:load("settingsManager")
53
---@class HelperFunctions
64
local helper = scm:load("helperFunctions")
75
---@class miningLib

scanner-lib

Lines changed: 0 additions & 1 deletion
This file was deleted.

testSuit/eventCallStack.lua

Lines changed: 0 additions & 6 deletions
This file was deleted.

testSuit/settingsManager.lua

Lines changed: 0 additions & 23 deletions
This file was deleted.

tests/test_spec.lua

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@
2828
---@field equal function
2929
assert = assert
3030

31-
local spath =
32-
debug.getinfo(1,'S').source:sub(2):gsub("/+", "/"):gsub("[^/]*$",""):gsub("/tests", ""):gsub("tests","")
33-
if spath == "" then
34-
spath = "./"
35-
end
36-
require(spath.."ccPackage")
31+
package.path = "libs/?.lua;"
32+
.. "libs/inventory/?.lua;"
33+
.. "libs/peripherals/?.lua;"
34+
.. package.path
35+
3736

37+
_G.settings = require("settings")
3838
local Vector = require("vector")
3939
local scanResultMock = require("scanResultMock")
4040
---@type TurtleEmulator

0 commit comments

Comments
 (0)