Skip to content

Commit 51a16ce

Browse files
committed
fix bug in obb install script
1 parent c12cba3 commit 51a16ce

File tree

2 files changed

+25
-14
lines changed

2 files changed

+25
-14
lines changed

AndroidTool/installObbForSerial.sh

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,38 @@ SVERSION='1.1b' #modified for AndroidTool
4242
#fi
4343

4444
function MAIN_PROCESS {
45-
file_name=$(basename "$file")
45+
file_name=$(basename "$file")
46+
dir_name=$(dirname "$file")
47+
48+
echo "0.01m ready to do stuff with $file"
49+
echo "0.m cd into $dir_name where we find $file_name"
50+
cd "$dir_name"
51+
echo "1.m file_name: $file_name"
4652

4753
if [[ ${file_name:0:5} = "main." ]]; then
4854
pkg_name=$(echo $file_name | perl -nle 'm/([^main\.\d+].+?(?=.obb))/; print $1')
4955
echo 'Copying' $file_name 'to obb/'$pkg_name'/'
50-
$adb shell mkdir -p sdcard/Android/obb/$pkg_name
51-
$adb push $file sdcard/Android/obb/$pkg_name/
56+
"$adb" shell mkdir -p sdcard/Android/obb/$pkg_name
57+
"$adb" push $file sdcard/Android/obb/$pkg_name/
5258
elif [[ ${file_name:0:6} = "patch." ]]; then
5359
pkg_name=$(echo $file_name | perl -nle 'm/([^patch\.\d+].+?(?=.obb))/; print $1')
5460
echo 'Copying' $file_name 'to obb/'$pkg_name'/'
55-
$adb shell mkdir -p sdcard/Android/obb/$pkg_name
56-
$adb push $file sdcard/Android/obb/$pkg_name/
57-
else
58-
pkg_name=$(echo $file_name | perl -nle 'm/(^[^-]+)/; print $1')
59-
obb_build=$(echo $file_name | perl -nle 'm/(?<=\-)(.*?)(?=\.)/; print $1')
60-
new_name=$obb_type.$obb_build.$pkg_name.obb
61-
mkdir -p .tmp-obb/$pkg_name
62-
echo 'Copying' $new_name 'to obb/'$pkg_name'/'
63-
cp $file .tmp-obb/$pkg_name/$new_name
64-
$adb shell mkdir -p sdcard/Android/obb/$pkg_name
65-
$adb push .tmp-obb/$pkg_name/$new_name sdcard/Android/obb/$pkg_name/
61+
"$adb" shell mkdir -p sdcard/Android/obb/$pkg_name
62+
"$adb" push $file sdcard/Android/obb/$pkg_name/
63+
else
64+
echo "2.m no indication of patch/main, using main"
65+
pkg_name=$(echo "$file_name" | perl -nle "m/(^[^-]+)/; print $1")
66+
obb_build=$(echo "$file_name" | perl -nle "m/(?<=\-)(.*?)(?=\.)/; print $1")
67+
new_name="$obb_type.$obb_build.$pkg_name.obb"
68+
echo "3.m creating local temp folder with package name: .tmp-obb/$pkg_name"
69+
mkdir -p ".tmp-obb/$pkg_name"
70+
echo "4.m Copying $new_name to obb/$pkg_name/"
71+
cp "$file" ".tmp-obb/$pkg_name/$new_name"
72+
echo "5. creating directory on device: $adb shell mkdir -p sdcard/Android/obb/$pkg_name"
73+
"$adb" shell mkdir -p "sdcard/Android/obb/$pkg_name"
74+
echo "6. pushing file to device: $adb push .tmp-obb/$pkg_name/$new_name sdcard/Android/obb/$pkg_name/"
75+
"$adb" push ".tmp-obb/$pkg_name/$new_name" "sdcard/Android/obb/$pkg_name/"
76+
echo "7. removing local temp folder"
6677
rm -r .tmp-obb
6778
fi
6879
exit

0 commit comments

Comments
 (0)