diff options
| -rwxr-xr-x | transcode.sh | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/transcode.sh b/transcode.sh index c222dc0..1283ca3 100755 --- a/transcode.sh +++ b/transcode.sh @@ -687,9 +687,9 @@ load_preset() { exit $EXIT_USAGE_ERROR fi - local file="$PRESET_DIR/$preset_name.sh" - if [[ ! -f "$file" ]]; then - error "Preset not found:" "$file" + local preset_file="$PRESET_DIR/$preset_name.sh" + if [[ ! -f "$preset_file" ]]; then + error "Preset not found:" "$preset_file" exit $EXIT_CONFIG_ERROR fi @@ -700,7 +700,7 @@ load_preset() { # of the symlink itself (always 777 on Linux), not the target. We use # readlink -f (GNU) with a fallback to realpath for macOS/BSD. local resolved_file - resolved_file=$(resolve_path "$file") + resolved_file=$(resolve_path "$preset_file") local preset_perms preset_perms=$(stat -c '%a' -- "$resolved_file" 2>/dev/null || stat -f '%OLp' -- "$resolved_file") @@ -713,10 +713,10 @@ load_preset() { unset -v ffargs ffargs=() - debug "Sourcing preset file:" "$file" + debug "Sourcing preset file:" "$preset_file" # shellcheck source=/dev/null - source "$file" + source "$preset_file" if [[ ${#ffargs[@]} -eq 0 ]]; then error "Preset '$preset_name' did not set ffargs" @@ -747,14 +747,14 @@ list_presets() { fi local -a preset_files=() - local f name max_name_len + local preset_file preset_name max_name_len max_name_len=0 - for f in "$PRESET_DIR"/*.sh; do - if [[ -f "$f" ]]; then - preset_files+=("$f") - name="${f##*/}" - name="${name%.sh}" - ((${#name} > max_name_len)) && max_name_len=${#name} + for preset_file in "$PRESET_DIR"/*.sh; do + if [[ -f "$preset_file" ]]; then + preset_files+=("$preset_file") + preset_name="${preset_file##*/}" + preset_name="${preset_name%.sh}" + ((${#preset_name} > max_name_len)) && max_name_len=${#preset_name} fi done @@ -769,25 +769,25 @@ list_presets() { msg "Available presets in:" "$PRESET_DIR" local target_path target_name description - for f in "${preset_files[@]}"; do - name="${f##*/}" - name="${name%.sh}" + for preset_file in "${preset_files[@]}"; do + preset_name="${preset_file##*/}" + preset_name="${preset_name%.sh}" - if [[ -L "$f" ]]; then - target_path=$(resolve_path "$f") + if [[ -L "$preset_file" ]]; then + target_path=$(resolve_path "$preset_file") if [[ "$target_path" == "$canonical_preset_dir"/*.sh ]]; then target_name="${target_path##*/}" target_name="${target_name%.sh}" - printf "${BOLD}${BLUE}%-${max_name_len}s${ALL_OFF} ${BOLD}${YELLOW}-${ALL_OFF} Symlinked to ${BOLD}${BLUE}%s${ALL_OFF}\n" "$name" "$target_name" + printf "${BOLD}${BLUE}%-${max_name_len}s${ALL_OFF} ${BOLD}${YELLOW}-${ALL_OFF} Symlinked to ${BOLD}${BLUE}%s${ALL_OFF}\n" "$preset_name" "$target_name" continue fi fi - description=$(sed -n '1s/^[[:space:]]*#[[:space:]]*[Dd]escription:[[:space:]]*//p' "$f") + description=$(sed -n '1s/^[[:space:]]*#[[:space:]]*[Dd]escription:[[:space:]]*//p' "$preset_file") if [[ -n "$description" ]]; then - printf "${BOLD}${BLUE}%-${max_name_len}s${ALL_OFF} ${BOLD}${YELLOW}-${ALL_OFF} %s\n" "$name" "$description" + printf "${BOLD}${BLUE}%-${max_name_len}s${ALL_OFF} ${BOLD}${YELLOW}-${ALL_OFF} %s\n" "$preset_name" "$description" else - printf "${BOLD}${BLUE}%-${max_name_len}s${ALL_OFF}\n" "$name" + printf "${BOLD}${BLUE}%-${max_name_len}s${ALL_OFF}\n" "$preset_name" fi done } |