Skip to content

Commit

Permalink
wording
Browse files Browse the repository at this point in the history
  • Loading branch information
paulrouget committed Feb 7, 2024
1 parent 3e49ea3 commit d956ab7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions app/src/converter.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ const ffmpeg = findExecutableFullPath("ffmpeg", exec_dir);
const ffprobe = findExecutableFullPath("ffprobe", exec_dir);

if (!fileExistsSync(ffmpeg)) {
logger.error("ffmpeg not found. Please ensure if ffmpeg is installed and try again.");
logger.error("ffmpeg not found. Install ffmpeg and make sure it's in your path.");
process.exit(1);
}
if (!fileExistsSync(ffprobe)) {
logger.error("ffprobe not found. Please ensure if ffprobe is installed and try again.");
logger.error("ffprobe not found. Install ffmpeg and make sure it's in your path.");
process.exit(1);
}

Expand Down
6 changes: 3 additions & 3 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ if [ ! $skip_packaging == 1 ]; then
yq ".package.deb" ./config.toml -o yaml | \
yq e ".package = \"${meta_id}.noffmpeg\"" |\
yq e ".conflicts = \"${meta_id}\"" |\
yq e ".description = \"${meta_description} (does not come with pre-built ffmpeg. Relies on system's ffmpeg)\"" |\
yq e ".description = \"${meta_description} (with system ffmpeg)\"" |\
yq e ".architecture = \"${deb_arch}\"" |\
yq e ".depends = \"ffmpeg\"" |\
yq e ".version = \"${meta_version}\"" > $target_dist_dir/deb/DEBIAN/control
Expand All @@ -380,7 +380,7 @@ if [ ! $skip_packaging == 1 ]; then
> $target_dist_dir/deb/DEBIAN/postinst
chmod +x $target_dist_dir/deb/DEBIAN/postinst

log "Building .deb file"
log "Building noffmpeg.deb file"
dpkg-deb --build $target_dist_dir/deb $target_dist_dir/$out_noffmpeg_deb_file

rm -rf $target_dist_dir/$package_binary_name-$meta_version
Expand All @@ -406,7 +406,7 @@ if [ ! $skip_packaging == 1 ]; then
yq ".package.deb" ./config.toml -o yaml | \
yq e ".package = \"${meta_id}\"" |\
yq e ".conflicts = \"${meta_id}.noffmpeg\"" |\
yq e ".description = \"${meta_description} (With pre-built ffmpeg shipped.)\"" |\
yq e ".description = \"${meta_description} (with builtin ffmpeg.)\"" |\
yq e ".architecture = \"${deb_arch}\"" |\
yq e ".version = \"${meta_version}\"" > $target_dist_dir/deb/DEBIAN/control

Expand Down

0 comments on commit d956ab7

Please sign in to comment.