Skip to content

Commit 4f89d08

Browse files
committed
builder - don't use hardcoded RetroPie-Setup path on host - use $scriptdir
Also fix bad indentation
1 parent 8a39a76 commit 4f89d08

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

scriptmodules/admin/builder.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,17 +108,17 @@ function chroot_build_builder() {
108108

109109

110110
if [[ ! -d "$chroot_rps_dir" ]]; then
111-
sudo -u $user git clone "$home/RetroPie-Setup" "$chroot_rps_dir"
111+
sudo -u $user git clone "$scriptdir" "$chroot_rps_dir"
112112
gpg --export-secret-keys "$__gpg_signing_key" >"$chroot_dir/retropie.key"
113113
rp_callModule image chroot "$chroot_dir" bash -c "\
114114
sudo gpg --import "/retropie.key"; \
115115
sudo rm "/retropie.key"; \
116116
sudo apt-get update; \
117117
sudo apt-get install -y git; \
118118
"
119-
# copy existing packages from host if building in a clean chroot to avoid rebuilding everything
120-
mkdir -p "$chroot_rps_dir/$archive_dir"
121-
rsync -av "$home/RetroPie-Setup/$archive_dir/" "$chroot_rps_dir/$archive_dir/"
119+
# copy existing packages from host if building in a clean chroot to avoid rebuilding everything
120+
mkdir -p "$chroot_rps_dir/$archive_dir"
121+
rsync -av "$scriptdir/$archive_dir/" "$chroot_rps_dir/$archive_dir/"
122122
else
123123
sudo -u $user git -C "$chroot_rps_dir" pull
124124
fi
@@ -139,6 +139,6 @@ function chroot_build_builder() {
139139
/home/pi/RetroPie-Setup/retropie_packages.sh builder "$@"
140140
done
141141

142-
rsync -av "$chroot_rps_dir/$archive_dir/" "$home/RetroPie-Setup/$archive_dir/"
142+
rsync -av "$chroot_rps_dir/$archive_dir/" "$scriptdir/$archive_dir/"
143143
done
144144
}

0 commit comments

Comments
 (0)