=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.50 retrieving revision 1.51 diff -u -r1.50 -r1.51 --- openbsd/fw_update/fw_install.sh 2021/12/07 02:35:57 1.50 +++ openbsd/fw_update/fw_install.sh 2021/12/07 02:42:01 1.51 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.50 2021/12/07 02:35:57 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.51 2021/12/07 02:42:01 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -134,21 +134,21 @@ } delete_firmware() { - local _pkg="$1" _pkgdir="${DESTDIR}/var/db/pkg" + local _cwd _pkg="$1" _pkgdir="${DESTDIR}/var/db/pkg" # TODO: Check hash for files before deleting echo "Uninstalling $_pkg" - cwd="${_pkgdir}/$_pkg" + _cwd="${_pkgdir}/$_pkg" - set -A _remove -- "${cwd}/+CONTENTS" "${cwd}" + set -A _remove -- "${_cwd}/+CONTENTS" "${_cwd}" while read -r c g; do case $c in - @cwd) cwd="${DESTDIR}$g" + @cwd) _cwd="${DESTDIR}$g" ;; @*) continue ;; - *) set -A _remove -- "$cwd/$c" "${_remove[@]}" + *) set -A _remove -- "$_cwd/$c" "${_remove[@]}" ;; esac done < "${_pkgdir}/${_pkg}/+CONTENTS"