Skip to content

Commit 42903b3

Browse files
committed
avoid warning, auto use sandbox
1 parent 4896bde commit 42903b3

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

cross_compile_ffmpeg.sh

+2-3
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ intro() {
7474
the sandbox directory, since it will have some hard coded paths in there.
7575
You can, of course, rebuild ffmpeg from within it, etc.
7676
EOL
77-
if [[ $sandbox_ok != 'y' ]]; then
77+
if [[ $sandbox_ok != 'y' && ! -d sandbox ]]; then
7878
yes_no_sel "Is ./sandbox ok (requires ~ 5GB space) [Y/n]?" "y"
7979
if [[ "$user_input" = "n" ]]; then
8080
exit 1
@@ -183,8 +183,7 @@ update_to_desired_git_branch_or_revision() {
183183
local desired_branch="$2" # or tag or whatever...
184184
if [ -n "$desired_branch" ]; then
185185
pushd $to_dir
186-
cd $to_dir
187-
echo "git checkout $desired_branch"
186+
echo "git checkout'ing $desired_branch"
188187
git checkout "$desired_branch" || exit 1 # if this fails, nuke the directory first...
189188
git merge "$desired_branch" || exit 1 # this would be if they want to checkout a revision number, not a branch...
190189
popd # in case it's a cd to ., don't want to cd to .. here...since sometimes we call it with a '.'

0 commit comments

Comments
 (0)