diff --git a/assets/release.sh b/assets/release.sh index f81eba8..374288c 100755 --- a/assets/release.sh +++ b/assets/release.sh @@ -41,15 +41,15 @@ release() { _nwjs_subdir="$(subst "${NWJS_SUBDIR}" "%NWJS_PLATFORM%" "${_platform}")"; _nwjs_url="$(subst "$(eval echo \"\${NWJS_URL_${_platform%%-*}}\")" "%NWJS_PLATFORM%" "${_platform}")"; _nwjs_fname="${RELEASES_DNAME}/${_nwjs_url##*/}"; - _release_dname="${RELEASES_DNAME}/${PACKAGE_NAME}-${PACKAGE_VERSION}-release-${_platform}"; + _release_dname="${RELEASES_DNAME}/${PACKAGE_NAME}-${_release_version}-release-${_platform}"; _release_fname="${_release_dname}.zip"; - _release_version="$(sed -n '/^\s\*"version":/s/^.*:\s*"\([0-9.]\+\)",\?\s*$/\1/p' package.json)"; + _release_version="$(sed -n '/^\s*"version":/s/^.*:\s*"\([0-9.]\+\)",\?\s*$/\1/p' package.json)"; - trap "rm -fr ${_nwjs_fname} ${_release_dname}" EXIT HUP INT QUIT PIPE TERM USR1 USR2; + trap "rm -fr ${_release_dname}" EXIT HUP INT QUIT PIPE TERM USR1 USR2; if [ "${_vflag:-0}" -eq 0 ]; then - wget -qO "${_nwjs_fname}" "${_nwjs_url}"; + wget -cqO "${_nwjs_fname}" "${_nwjs_url}"; else - wget -O "${_nwjs_fname}" "${_nwjs_url}"; + wget -cO "${_nwjs_fname}" "${_nwjs_url}"; fi; rm -rf "${_release_dname}"; mkdir -p "${_release_dname}"; extract "${_nwjs_fname}" "${_release_dname}"; @@ -74,8 +74,7 @@ release() { else zip -9 -r "${_release_fname##${RELEASES_DNAME}/}" "${_release_dname##${RELEASES_DNAME}/}"; fi; - cd "${OLDPWD}"; - rm -fr "${_nwjs_fname}" "${_release_dname}"; + cd "${OLDPWD}"; rm -fr "${_release_dname}"; trap - EXIT HUP INT QUIT PIPE TERM USR1 USR2; };