Skip to content

Commit 4ed0051

Browse files
committed
fix(installer): adjustments to ffmpeg build from source
1 parent bbed587 commit 4ed0051

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

setup/quickbox-setup

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -574,16 +574,16 @@ function _lshell() {
574574
function _ffmpeg() {
575575
if [[ ${ffmpeg} == "yes" ]]; then
576576
apt-get -qy update >>"${OUTTO}" 2>&1;
577-
LIST='autotools-dev aclocal autoconf automake cmake cmake-curses-gui build-essential mercurial libass-dev'
577+
LIST='autotools-dev autoconf automake cmake cmake-curses-gui build-essential mercurial libass-dev'
578578
for depend in $LIST; do
579-
apt-get -qq -y install $depend >>"${OUTTO}" 2>&1;
579+
apt-get -qq -y install "${depend}" >>"${OUTTO}" 2>&1;
580580
done
581581
MAXCPUS=$(echo "$(nproc) / 2"|bc)
582-
mkdir /tmp
582+
mkdir -p /tmp
583583
cd /tmp
584584
if [[ -d /tmp/ffmpeg ]]; then rm -rf ffmpeg;fi
585585
git clone --depth 1 -b release/4.4 https://github.com/FFmpeg/FFmpeg.git ffmpeg >>"${OUTTO}" 2>&1
586-
git clone git://github.com/yasm/yasm.git ffmpeg/yasm >>"${OUTTO}" 2>&1
586+
git clone https://github.com/yasm/yasm.git ffmpeg/yasm >>"${OUTTO}" 2>&1
587587
git clone https://github.com/yixia/x264.git ffmpeg/x264 >>"${OUTTO}" 2>&1
588588
#hg clone https://bitbucket.org/multicoreware/x265 ffmpeg/x265 >>"${OUTTO}" 2>&1
589589
git clone https://bitbucket.org/multicoreware/x265_git.git ffmpeg/x265 >>"${OUTTO}" 2>&1
@@ -626,8 +626,9 @@ function _ffmpeg() {
626626
--pkg-config-flags="--static" >>"${OUTTO}" 2>&1
627627
make -j${MAXCPUS} >>"${OUTTO}" 2>&1
628628
make install >>"${OUTTO}" 2>&1
629-
cp /usr/local/bin/ffmpeg /usr/bin >>"${OUTTO}" 2>&1
630-
cp /usr/local/bin/ffprobe /usr/bin >>"${OUTTO}" 2>&1
629+
\cp -rf /usr/local/bin/ffmpeg /usr/bin >>"${OUTTO}" 2>&1
630+
\cp -rf /usr/local/bin/ffprobe /usr/bin >>"${OUTTO}" 2>&1
631+
cd /tmp
631632
rm -rf /tmp/ffmpeg >>"${OUTTO}" 2>&1
632633
fi
633634
}

0 commit comments

Comments
 (0)