Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update repo_url. Rename /sm64pi/sm64pc -> /sm64pc/sm64ex

This commit is contained in:
Jose Cerrejon 2020-07-06 19:29:52 +02:00
parent 83c044da72
commit d30a923e28
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
pisetup.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Super Mario 64 PC on Raspberry Pi # Super Mario 64 PC on Raspberry Pi
# Find latest updates and code on https://www.github.com/sm64pc/sm64pc # Find latest updates and code on https://www.github.com/sm64pc/sm64ex
# NOTE: If you clone the repo, source must be copied in ~/src/sm64pi/sm64pc/ # NOTE: If you clone the repo, source must be copied in ~/src/sm64pc/sm64ex/
# ToDo: Test on more Pi models with fresh Raspbian and allow existing src folders to be updated. # ToDo: Test on more Pi models with fresh Raspbian and allow existing src folders to be updated.
# #
clear clear
@ -12,7 +12,7 @@ lowmem=0
pi=0 pi=0
pimodel=$(uname -m 2>/dev/null || echo unknown) pimodel=$(uname -m 2>/dev/null || echo unknown)
pitype=$(tr -d '\0' < /sys/firmware/devicetree/base/model) pitype=$(tr -d '\0' < /sys/firmware/devicetree/base/model)
repo_url="https://github.com/sm64pc/sm64pc" repo_url="https://github.com/sm64pc/sm64ex"
if [[ $pimodel =~ "armv6" ]] if [[ $pimodel =~ "armv6" ]]
then then
@ -233,10 +233,10 @@ clear
echo "Super Mario 64 RPi preparation & downloader" echo "Super Mario 64 RPi preparation & downloader"
echo "" echo ""
echo "Checking in current directory and" echo "Checking in current directory and"
echo "checking in "$HOME"/src/sm64pi/sm64pc/ for existing Super Mario 64 PC files" echo "checking in "$HOME"/src/sm64pc/sm64ex/ for existing Super Mario 64 PC files"
echo "" echo ""
sm64dircur=$(ls ./Makefile) sm64dircur=$(ls ./Makefile)
sm64dir=$(ls $HOME/src/sm64pi/sm64pc/Makefile) sm64dir=$(ls $HOME/src/sm64pc/sm64ex/Makefile)
if [[ $sm64dircur =~ "Makefile" ]] #If current directory has a makefile if [[ $sm64dircur =~ "Makefile" ]] #If current directory has a makefile
then then
@ -256,7 +256,7 @@ then
curdir=1 curdir=1
fi fi
else #Do a fresh compile in HOME/src/sm64pi/sm64pc/ else #Do a fresh compile in HOME/src/sm64pc/sm64ex/
sm64dir=0; sm64dir=0;
curdir=0; curdir=0;
fi fi
@ -273,16 +273,16 @@ read -p "Proceed? (Y/N): " gitins
if [[ $gitins =~ [Yy] ]] if [[ $gitins =~ [Yy] ]]
then then
echo "" echo ""
echo "Creating directory "$HOME"/src/sm64pi" echo "Creating directory "$HOME"/src/sm64pc"
mkdir $HOME/src/ mkdir $HOME/src/
cd $HOME/src/ cd $HOME/src/
mkdir $HOME/src/sm64pi mkdir $HOME/src/sm64pc
cd $HOME/src/sm64pi cd $HOME/src/sm64pc
echo "" echo ""
echo "Downloading latest Super Mario 64 PC-port code" echo "Downloading latest Super Mario 64 PC-port code"
git clone ${repo_url} git clone ${repo_url}
cd $HOME/src/sm64pi/sm64pc/ cd $HOME/src/sm64pc/sm64ex/
echo "Download complete" echo "Download complete"
echo "" echo ""
sleep 2 sleep 2
@ -302,14 +302,14 @@ if [[ $curdir == 1 ]]
then then
echo "Assets will be extracted from "$PWD" " echo "Assets will be extracted from "$PWD" "
else else
echo "Assets will be extracted from $HOME/src/sm64pi/sm64pc/baserom.(us/eu/jp).z64 " echo "Assets will be extracted from $HOME/src/sm64pc/sm64ex/baserom.(us/eu/jp).z64 "
fi fi
if [[ $curdir == 1 ]] if [[ $curdir == 1 ]]
then then
sm64z64=$(find ./* | grep baserom) #See if current directory is prepped sm64z64=$(find ./* | grep baserom) #See if current directory is prepped
else else
sm64z64=$(find $HOME/src/sm64pi/sm64pc/* | grep baserom) #see if fresh compile directory is prepped sm64z64=$(find $HOME/src/sm64pc/sm64ex/* | grep baserom) #see if fresh compile directory is prepped
fi fi
if [[ $sm64z64 =~ "baserom" ]] if [[ $sm64z64 =~ "baserom" ]]
@ -331,7 +331,7 @@ echo $PWD
echo "" echo ""
else else
echo "" echo ""
echo $HOME/src/sm64pi/sm64pc/ echo $HOME/src/sm64pc/sm64ex/
fi fi
sleep 5 sleep 5
@ -347,7 +347,7 @@ echo ""
if [[ $curdir != 1 ]] # If we're not compiling from a git zip / random directory if [[ $curdir != 1 ]] # If we're not compiling from a git zip / random directory
then then
cd $HOME/src/sm64pi/sm64pc/ cd $HOME/src/sm64pc/sm64ex/
fi fi
echo "Beginning Super Mario 64 RasPi compilation!" echo "Beginning Super Mario 64 RasPi compilation!"
@ -373,7 +373,7 @@ if [[ $curdir == 1 ]]
then then
sm64done=$(find ./build/*/* | grep .arm) sm64done=$(find ./build/*/* | grep .arm)
else else
sm64done=$(find $HOME/src/sm64pi/sm64pc/build/*/* | grep .arm) sm64done=$(find $HOME/src/sm64pc/sm64ex/build/*/* | grep .arm)
fi fi
echo "" echo ""
@ -386,7 +386,7 @@ if [[ $curdir == 1 ]]
then then
$sm64loc=$(ls ./build/*pc/*.arm) $sm64loc=$(ls ./build/*pc/*.arm)
else else
$sm64loc=$(ls $HOME/src/sm64pi/sm64pc/build/*pc/*.arm) $sm64loc=$(ls $HOME/src/sm64pc/sm64ex/build/*pc/*.arm)
fi fi
echo $sm64loc echo $sm64loc