浏览代码

buildEssentialLib

gemer 4 年之前
父节点
当前提交
bca5b5cd1f
共有 2 个文件被更改,包括 8 次插入4 次删除
  1. 2 2
      README.md
  2. 6 2
      install-ffmpeg

+ 2 - 2
README.md

@@ -37,14 +37,14 @@ This repository is build with the FFmpeg build script provides an easy way to bu
 ### Easy installation with effective 4dag-ffmpeg :
 ### Easy installation with effective 4dag-ffmpeg :
 
 
 ```bash
 ```bash
-$ /bin/bash -c "$(curl -fsSL http://192.168.0.115:3000/zhangyupeng/4dage-ffmpeg/raw/master/web-install.sh)" 
+$ sudo /bin/bash -c "$(curl -fsSL http://192.168.0.115:3000/zhangyupeng/4dage-ffmpeg/raw/master/web-install.sh)" 
 ```
 ```
 
 
 
 
 ### Only update 4dag-ffmpeg for feature:
 ### Only update 4dag-ffmpeg for feature:
 
 
 ```bash
 ```bash
-$ /bin/bash -c "$(curl -fsSL http://192.168.0.115:3000/zhangyupeng/4dage-ffmpeg/raw/master/install-4dage)"  
+$ sudo /bin/bash -c "$(curl -fsSL http://192.168.0.115:3000/zhangyupeng/4dage-ffmpeg/raw/master/install-4dage)"  
 ```
 ```
 
 
 ### Deb installation:
 ### Deb installation:

+ 6 - 2
install-ffmpeg

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # export http_proxy=http://192.168.0.144:7890   https_proxy=http://192.168.0.144:7890
 # export http_proxy=http://192.168.0.144:7890   https_proxy=http://192.168.0.144:7890
 
 
 PROGNAME=$(basename "$0")
 PROGNAME=$(basename "$0")
@@ -245,6 +245,11 @@ PKG_CONFIG_PATH="/usr/local/lib/x86_64-linux-gnu/pkgconfig:/usr/local/lib/pkgcon
 PKG_CONFIG_PATH+=":/usr/local/share/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib64/pkgconfig"
 PKG_CONFIG_PATH+=":/usr/local/share/pkgconfig:/usr/lib/x86_64-linux-gnu/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig:/usr/lib64/pkgconfig"
 export PKG_CONFIG_PATH
 export PKG_CONFIG_PATH
 
 
+buildEssentialLib() {
+  sudo apt-get install -y build-essential pkg-config autoconf m4 libtool curl -y
+}
+buildEssentialLib
+
 if ! command_exists "make"; then
 if ! command_exists "make"; then
   echo "make not installed."
   echo "make not installed."
   exit 1
   exit 1
@@ -753,7 +758,6 @@ if [ ! -d "$WORKSPACE/speech-denoiser" ]; then
 fi
 fi
 
 
 cd "$WORKSPACE/speech-denoiser"
 cd "$WORKSPACE/speech-denoiser"
-sudo apt-get install -y build-essential pkg-config autoconf m4 libtool curl -y
 if command_exists "python3"; then
 if command_exists "python3"; then
   pyv="$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[:3])))' 2>&1)"
   pyv="$(python3 -c 'import sys; print(".".join(map(str, sys.version_info[:3])))' 2>&1)"
   laverison="3.5.2"
   laverison="3.5.2"