diff --git a/tools/LinuxOneShot/SetupProgram/PreCompile.sh b/tools/LinuxOneShot/SetupProgram/PreCompile.sh index 74c198f8cda..7eca9e4c95a 100644 --- a/tools/LinuxOneShot/SetupProgram/PreCompile.sh +++ b/tools/LinuxOneShot/SetupProgram/PreCompile.sh @@ -15,8 +15,6 @@ set +e has_git="$(command -v git)" has_cargo="$(command -v ~/.cargo/bin/cargo)" has_sudo="$(command -v sudo)" -has_cmake="$(command -v cmake)" -has_gpp="$(command -v g++-6)" has_grep="$(command -v grep)" DATABASE_EXISTS="$(mysqlshow --host mariadb --port 3306 --user=root --password=$MYSQL_ROOT_PASSWORD ss13_db| grep -v Wildcard | grep -o ss13_db)" set -e @@ -29,19 +27,17 @@ if ! [ -x "$has_cargo" ]; then fi # apt packages -if ! { [ -x "$has_git" ] && [ -x "$has_cmake" ] && [ -x "$has_gpp" ] && [ -x "$has_grep" ] && [ -f "/usr/lib/i386-linux-gnu/libmariadb.so.3" ] && [ -f "/usr/lib/i386-linux-gnu/libssl.so" ] && [ -d "/usr/share/doc/g++-6-multilib" ] && [ -f "/usr/bin/mysql" ] && [ -d "/usr/include/mysql" ]; }; then +if ! { [ -x "$has_git" ] && [ -x "$has_grep" ] && [ -f "/usr/lib/i386-linux-gnu/libssl.so" ] && [ -f "/usr/bin/mysql" ] && [ -d "/usr/include/mysql" ]; }; then echo "Installing apt dependencies..." if ! [ -x "$has_sudo" ]; then dpkg --add-architecture i386 apt-get update - apt-get install -y git cmake libmariadb-dev:i386 libssl-dev:i386 grep g++-6 g++-6-multilib mysql-client - ln -s /usr/include/mariadb /usr/include/mysql + apt-get install -y git libssl-dev:i386 grep mysql-client rm -rf /var/lib/apt/lists/* else sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt-get install -y git cmake libmariadb-dev:i386 libssl-dev:i386 grep g++-6 g++-6-multilib mysql-client - sudo ln -s /usr/include/mariadb /usr/include/mysql + sudo apt-get install -y git libssl-dev:i386 grep mysql-client sudo rm -rf /var/lib/apt/lists/* fi fi @@ -57,17 +53,6 @@ else cd .. fi -#update BSQL -if [ ! -d "BSQL" ]; then - echo "Cloning BSQL..." - git clone https://github.com/tgstation/BSQL -else - echo "Fetching BSQL..." - cd BSQL - git fetch - cd .. -fi - echo "Deploying rust-g..." cd rust-g git checkout "$RUST_G_VERSION" @@ -75,18 +60,6 @@ git checkout "$RUST_G_VERSION" mv target/release/librust_g.so "$1/rust_g" cd .. -echo "Deploying BSQL..." -cd BSQL -git checkout "$BSQL_VERSION" -mkdir -p mysql -mkdir -p artifacts -cd artifacts -cmake .. -DCMAKE_CXX_COMPILER=g++-6 -DMARIA_LIBRARY=/usr/lib/i386-linux-gnu/libmariadb.so.3 -make -mv src/BSQL/libBSQL.so "$1/" -cp /usr/lib/i386-linux-gnu/libmariadb.so.3 "$1/" -cd ../.. - if [ ! -d "../GameStaticFiles/config" ]; then echo "Creating initial config..." cp -r "$1/config" "../GameStaticFiles/config" @@ -101,6 +74,3 @@ if [ "$DATABASE_EXISTS" != "ss13_db" ]; then mysql -u root --password=$MYSQL_ROOT_PASSWORD -h mariadb -P 3306 ss13_db < "$1/$TGS_PREFIXED_SCHEMA_FILE" mysql -u root --password=$MYSQL_ROOT_PASSWORD -h mariadb -P 3306 ss13_db -e "INSERT INTO \`SS13_schema_revision\` (\`major\`, \`minor\`) VALUES ($TGS_SCHEMA_MAJOR_VERSION, $TGS_SCHEMA_MINOR_VERSION)" fi - -#just trust me, i nearly lost my shit -rm -rf "$1/byond-extools.dll"