AstralTransRocketries/OCEmu
1
0
Fork 0
mirror of https://github.com/zenith391/OCEmu.git synced 2025-09-12 14:24:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed rm prompting (#10)

Browse Source 
Switch usage of `rm -r` to `rm -rf`
This commit is contained in:
misiuji 2021-06-30 22:03:02 +02:00 committed by GitHub
parent f37552c244
commit 15df352458
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,3 +8,4 @@ log.txt
src/*.dll src/*.dll
src/OCEmu.exe src/OCEmu.exe
src/builddate.txt src/builddate.txt
.vscode/tasks.json

14
msys2_setup_ocemu.sh
View File

@ -28,7 +28,7 @@ if [ ! -e mingw-w64-${MACHINE_TYPE}-lua-5.2.4-1-any.pkg.tar.zst ]; then
fi fi
pacman --noconfirm -U mingw-w64-${MACHINE_TYPE}-lua-5.2.4-1-any.pkg.tar.zst pacman --noconfirm -U mingw-w64-${MACHINE_TYPE}-lua-5.2.4-1-any.pkg.tar.zst
cd .. cd ..
rm -r mingw-w64-lua rm -rf mingw-w64-lua
if [ -e src/extras ]; then if [ -e src/extras ]; then
read -p "src/extras already exists, remove? [y/N] " -n 1 -r read -p "src/extras already exists, remove? [y/N] " -n 1 -r
echo echo
@ -36,7 +36,7 @@ if [ -e src/extras ]; then
echo "Not removing existing folder." echo "Not removing existing folder."
exit 1 exit 1
fi fi
rm -r src/extras rm -rf src/extras
fi fi
mkdir src/extras mkdir src/extras
if [ ! -e src/extras ]; then if [ ! -e src/extras ]; then
@ -79,7 +79,7 @@ if [ ! -e src/lfs.dll ]; then
fi fi
mv src/lfs.dll .. mv src/lfs.dll ..
cd .. cd ..
rm -r luafilesystem rm -rf luafilesystem
git clone -b 0.1.1 --depth=1 https://github.com/starwing/luautf8.git git clone -b 0.1.1 --depth=1 https://github.com/starwing/luautf8.git
if [ ! -e luautf8 ]; then if [ ! -e luautf8 ]; then
echo "Failed to download luautf8" echo "Failed to download luautf8"
@ -94,7 +94,7 @@ if [ ! -e lua-utf8.dll ]; then
fi fi
mv lua-utf8.dll .. mv lua-utf8.dll ..
cd .. cd ..
rm -r luautf8 rm -rf luautf8
git clone --depth=1 https://github.com/gamax92/luaffifb.git git clone --depth=1 https://github.com/gamax92/luaffifb.git
if [ ! -e luaffifb ]; then if [ ! -e luaffifb ]; then
echo "Failed to download luaffifb" echo "Failed to download luaffifb"
@ -119,7 +119,7 @@ if [ ! -e ffi.dll ]; then
fi fi
mv ffi.dll .. mv ffi.dll ..
cd .. cd ..
rm -r luaffifb rm -rf luaffifb
git clone -b v3.0-rc1 --depth=1 https://github.com/diegonehab/luasocket.git git clone -b v3.0-rc1 --depth=1 https://github.com/diegonehab/luasocket.git
if [ ! -e luasocket ]; then if [ ! -e luasocket ]; then
@ -150,7 +150,7 @@ if [ ! -e src/mime.dll.1.0.3 ]; then
fi fi
prefix=../.. PLAT=mingw CDIR_mingw= LDIR_mingw= make install prefix=../.. PLAT=mingw CDIR_mingw= LDIR_mingw= make install
cd .. cd ..
rm -r luasocket rm -rf luasocket
git clone -b master https://github.com/brunoos/luasec.git git clone -b master https://github.com/brunoos/luasec.git
if [ ! -e luasec ]; then if [ ! -e luasec ]; then
echo "Failed to download luasec" echo "Failed to download luasec"
@ -183,7 +183,7 @@ if [ ! -e src/ssl.dll ]; then
fi fi
DESTDIR=../.. LUAPATH= LUACPATH= make install DESTDIR=../.. LUAPATH= LUACPATH= make install
cd .. cd ..
rm -r luasec rm -rf luasec
cd .. cd ..
echo "Built dependencies!" echo "Built dependencies!"
gcc -s -o OCEmu.exe winstub.c -Wl,--subsystem,windows -mwindows -llua gcc -s -o OCEmu.exe winstub.c -Wl,--subsystem,windows -mwindows -llua