Skip to content

Commit bee3dd5

Browse files
committed
3.1.0
Fix bugs caused by the BIN_PATH.
1 parent 2ef49cb commit bee3dd5

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

install-ffmpeg-4_0_6.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ function mcd {
2424
cd "$1" || fail
2525
}
2626

27-
sudo apt-get update -qq && sudo apt-get -y install \
27+
sudo apt-get update -qq || fail
28+
sudo apt-get -y install \
2829
autoconf automake build-essential cmake \
2930
git-core libass-dev libfreetype6-dev \
3031
libgnutls28-dev libsdl2-dev libtool \
@@ -160,7 +161,7 @@ PATH="$BIN_PATH:$PATH" PKG_CONFIG_PATH="$BUILD_PATH/lib/pkgconfig:$PKG_CONFIG_PA
160161
--enable-libx265 \
161162
--enable-shared \
162163
--enable-nonfree
163-
PATH="$HOME/bin:$PATH" make -j$(nproc) || fail
164+
PATH="$BIN_PATH:$PATH" make -j$(nproc) || fail
164165
sudo make install || fail
165166
hash -r || fail
166167

@@ -174,4 +175,4 @@ export PATH=$BUILD_PATH:$PATH
174175
export PKG_CONFIG_PATH=$BUILD_PATH/lib/pkgconfig:$PKG_CONFIG_PATH
175176
export PKG_CONFIG_LIBDIR=$BUILD_PATH/lib/:$PKG_CONFIG_LIBDIR
176177

177-
msg "According to the instructions from ffmpeg, you need to run \"source ~/.profile\" now."
178+
msg "According to the instructions from ffmpeg, you need to run \"source ~/.profile\" now. You may need to add \"${BIN_PATH}\" to your \$PATH."

install-ffmpeg-4_4.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ PATH="$BIN_PATH:$PATH" PKG_CONFIG_PATH="$BUILD_PATH/lib/pkgconfig:$PKG_CONFIG_PA
233233
--enable-libx265 \
234234
--enable-shared \
235235
--enable-nonfree
236-
PATH="$HOME/bin:$PATH" make -j$(nproc) || fail
236+
PATH="$BIN_PATH:$PATH" make -j$(nproc) || fail
237237
sudo make install || fail
238238
hash -r || fail
239239

@@ -247,4 +247,4 @@ export PATH=$BUILD_PATH:$PATH
247247
export PKG_CONFIG_PATH=$BUILD_PATH/lib/pkgconfig:$PKG_CONFIG_PATH
248248
export PKG_CONFIG_LIBDIR=$BUILD_PATH/lib/:$PKG_CONFIG_LIBDIR
249249

250-
msg "According to the instructions from ffmpeg, you need to run \"source ~/.profile\" now."
250+
msg "According to the instructions from ffmpeg, you need to run \"source ~/.profile\" now. You may need to add \"${BIN_PATH}\" to your \$PATH."

0 commit comments

Comments
 (0)