mirror of
https://github.com/searxng/searxng.git
synced 2024-09-12 16:30:33 +02:00
[mod] utils/manage_static.sh: simplify git restore actions
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
parent
2cb1f35086
commit
80710c666f
@ -105,31 +105,6 @@ static.build.commit() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
static.git.restore.staged() {
|
|
||||||
local STAGED_FILES
|
|
||||||
STAGED_FILES=$(git diff --name-only --cached)
|
|
||||||
|
|
||||||
for i in ${BUILT_PATHS[*]}; do
|
|
||||||
STAGED_FILES_FOR_I=$(echo "${STAGED_FILES}" | grep "^${i}")
|
|
||||||
if [ -n "${STAGED_FILES_FOR_I}" ]; then
|
|
||||||
# shellcheck disable=SC2086
|
|
||||||
git restore --staged ${STAGED_FILES_FOR_I}
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
static.git.restore() {
|
|
||||||
static.git.restore.staged
|
|
||||||
|
|
||||||
NOT_COMMITED_FILES="$(git diff --name-only)"
|
|
||||||
for i in ${BUILT_PATHS[*]}; do
|
|
||||||
NOT_COMMITED_FILES_FOR_I=$(echo "${NOT_COMMITED_FILES}" | grep "^${i}")
|
|
||||||
if [ -n "${NOT_COMMITED_FILES_FOR_I}" ]; then
|
|
||||||
# shellcheck disable=SC2086
|
|
||||||
git restore ${NOT_COMMITED_FILES_FOR_I}
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
main() {
|
main() {
|
||||||
case $1 in
|
case $1 in
|
||||||
@ -147,11 +122,11 @@ main() {
|
|||||||
# after "git add ."
|
# after "git add ."
|
||||||
# remove the built files
|
# remove the built files
|
||||||
# so only the source are commited
|
# so only the source are commited
|
||||||
static.git.restore.staged
|
git restore --staged "${BUILT_PATHS[@]}"
|
||||||
;;
|
;;
|
||||||
static.git.restore)
|
static.git.restore)
|
||||||
# "git restore" of the built files.
|
# "git restore" of the built files.
|
||||||
static.git.restore
|
git restore --worktree --staged "${BUILT_PATHS[@]}"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user