From 3fd99058301e1c50ab60f77347e3e6477ed4eaf2 Mon Sep 17 00:00:00 2001 From: Alex Xu Date: Tue, 4 Mar 2014 17:03:41 -0500 Subject: .travis.sh: rm -r -> rm -rf --- .travis.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.travis.sh b/.travis.sh index 6648a37..5ae4dd0 100755 --- a/.travis.sh +++ b/.travis.sh @@ -36,14 +36,14 @@ case "$1" in make $MAKEOPTS >/dev/null sudo make $MAKEOPTS install >/dev/null cd .. - rm -r libwebp-0.4.0 + rm -rf libwebp-0.4.0 cd node-v* ./configure --openssl-use-sys --shared-zlib make $MAKEOPTS >/dev/null sudo python tools/install.py install >/dev/null cd .. - rm -r node-v* + rm -rf node-v* sudo npm install -g uglify-js @@ -52,28 +52,28 @@ case "$1" in make $MAKEOPTS >/dev/null sudo make $MAKEOPTS install >/dev/null cd .. - rm -r fdk-aac-0.1.3 + rm -rf fdk-aac-0.1.3 cd opus-1.1 ./configure --disable-shared --disable-extra-programs --disable-dependency-tracking --quiet make $MAKEOPTS >/dev/null sudo make $MAKEOPTS install >/dev/null cd .. - rm -r opus-1.1 + rm -rf opus-1.1 cd libvpx-v1.3.0 ./configure make $MAKEOPTS >/dev/null sudo make $MAKEOPTS install >/dev/null cd .. - rm -r libvpx-v1.3.0 + rm -rf libvpx-v1.3.0 cd ffmpeg ./configure --disable-everything --disable-logging --disable-programs --disable-runtime-cpudetect --enable-decoder=mpeg4 --enable-decoder=pcm_s16le --enable-decoder=vorbis --enable-decoder=rawvideo --enable-demuxer=matroska --enable-demuxer=ogg --enable-demuxer=wav --enable-demuxer=yuv4mpegpipe --enable-encoder=libfdk_aac --enable-encoder=libopus --enable-encoder=libtheora --enable-encoder=libvpx_vp8 --enable-encoder=libvpx_vp9 --enable-encoder=libx264 --enable-encoder=pcm_s16le --enable-encoder=rawvideo --enable-ffmpeg --enable-filter=aresample --enable-gpl --enable-hardcoded-tables --enable-libfdk_aac --enable-libopus --enable-libtheora --enable-libvpx --enable-libx264 --enable-muxer=ipod --enable-muxer=mp4 --enable-muxer=ogg --enable-muxer=wav --enable-muxer=webm --enable-muxer=yuv4mpegpipe --enable-nonfree --enable-protocol=file make $MAKEOPTS >/dev/null sudo make $MAKEOPTS install >/dev/null cd .. - rm -r ffmpeg + rm -rf ffmpeg patch -p0 <