Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Appearance settings

Commit beb7099

Browse filesBrowse files
authored
Merge pull request markus-perl#20 from rsnk96/master
Added $AUTOINSTALL for usability in other scripts. Fixed outdated build command. Added URL within quotes for the one-command-installation.
2 parents 98ec25f + 21ea4c3 commit beb7099
Copy full SHA for beb7099

File tree

Expand file treeCollapse file tree

2 files changed

+12
-6
lines changed
Filter options
Expand file treeCollapse file tree

2 files changed

+12
-6
lines changed

‎README.md

Copy file name to clipboardExpand all lines: README.md
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,23 +58,23 @@ Installation
5858

5959
Open your command line and run (needs curl to be installed):
6060

61-
```
62-
bash <(curl -s https://raw.githubusercontent.com/markus-perl/ffmpeg-build-script/master/web-install.sh?v1)
61+
```bash
62+
bash <(curl -s "https://raw.githubusercontent.com/markus-perl/ffmpeg-build-script/master/web-install.sh?v1")
6363
```
6464
This command downloads the build script and automatically starts the build process.
6565

6666
### Common installation
6767

68-
```
68+
```bash
6969
git clone https://github.com/markus-perl/ffmpeg-build-script.git
7070
cd ffmpeg-build-script
71-
./ffmpeg-build-script --help
71+
./build-ffmpeg --help
7272
```
7373

7474
Usage
7575
------
7676

77-
```
77+
```bash
7878
./build-ffmpeg --help Display usage information
7979
./build-ffmpeg --build Starts the build process
8080
./build-ffmpeg --cleanup Remove all working dirs

‎build-ffmpeg

Copy file name to clipboardExpand all lines: build-ffmpeg
+7-1Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,13 @@ echo "Building done. The binary can be found here: $WORKSPACE/bin/ffmpeg"
384384
echo ""
385385

386386

387-
if [[ ! $SKIPINSTALL == "yes" ]]; then
387+
if [[ $AUTOINSTALL == "yes" ]]; then
388+
if command_exists "sudo"; then
389+
sudo cp "$WORKSPACE/bin/ffmpeg" "$INSTALL_FOLDER/ffmpeg"
390+
sudo cp "$WORKSPACE/bin/ffprobe" "$INSTALL_FOLDER/ffprobe"
391+
echo "Done. ffmpeg is now installed to your system"
392+
fi
393+
elif [[ ! $SKIPINSTALL == "yes" ]]; then
388394
if command_exists "sudo"; then
389395

390396
read -r -p "Install the binary to your $INSTALL_FOLDER folder? [Y/n] " response

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.