Skip to content

Commit be65f53

Browse files
committed
fix gh release not updating correctly
Signed-off-by: Tin Lai <[email protected]>
1 parent 71746a1 commit be65f53

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

libexec/shsh-upgrade

+4-4
Original file line numberDiff line numberDiff line change
@@ -92,15 +92,16 @@ package="$1"
9292

9393
parse_install_folder "$package"
9494
package_exists "$_folder_full" || exit 1
95+
target_folder="${SHSH_PACKAGES_PATH}/$_folder_full"
9596

9697
if [ -d "${SHSH_PACKAGES_PATH}/$_folder_full/".git ]; then
9798
# git package
9899
if [ -z "$force_upgrade" ] && git_check_up_to_date "${SHSH_PACKAGES_PATH}/$_folder_full"; then
99100
exit
100101
fi
101-
elif [ -e "$target_folder/.gh-release_info" ]; then
102+
elif [ -e "${target_folder:?}/.gh-release_info" ]; then
102103
# gh release
103-
if gh_release_check_up_to_date "$_folder_full" "$target_folder"; then
104+
if [ -z "$force_upgrade" ] && gh_release_check_up_to_date "$_folder_full" "$target_folder"; then
104105
exit
105106
fi
106107
gh_release="true"
@@ -118,7 +119,6 @@ shsh-_unlink-man "$_folder_full"
118119
shsh-_unlink-bins "$_folder_full"
119120
shsh-_unlink-completions "$_folder_full"
120121

121-
target_folder="${SHSH_PACKAGES_PATH}/$_folder_full"
122122

123123
cd "${SHSH_PACKAGES_PATH}/$_folder_full"
124124
# upgrade the package
@@ -132,7 +132,7 @@ else
132132
# plain package or gh release
133133
# remove the folder and rerun hook in a plain folder
134134
# shellcheck disable=SC2011
135-
ls -A1 | xargs rm -rf
135+
ls -A1 | grep -v '^.gh-release_info$' | xargs rm -rf
136136
fi
137137

138138
if [ -n "$gh_release" ]; then

0 commit comments

Comments
 (0)