mirrors/Firefox-UI-Fix
1
Fork 0
mirror of https://github.com/black7375/Firefox-UI-Fix.git synced 2026-01-30 12:20:36 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Clean: Install - separated file stash and pop

Browse source
This commit is contained in:
alstjr7375 2022-04-20 11:34:39 +09:00
parent 6fb2ddcb64
commit 1663cc08e7
1 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

27
install.sh
View file

@ -774,6 +774,21 @@ install_profile() {
}
#** Update *********************************************************************
file_stash() {
# use as: local gitDirty="$(file_stash GIT_PATH)"
gitDir=$1
if [[ $(git diff --stat) != '' ]]; then
git --git-dir "${gitDir}" stash
fi
}
file_restore() {
local gitDir=$1
local gitDirty=$2
if [ -n "${gitDirty}" ]; then
git --git-dir "${gitDir}" --quiet stash pop
fi
}
update_profile() {
check_git
for profileDir in "${firefoxProfileDirPaths[@]}"; do
@ -787,20 +802,12 @@ update_profile() {
local LEPTONGITPATH="${Path}/chrome/.git"
if [ "${Type}" == "Git" ]; then
local gitDirty=""
if [[ $(git diff --stat) != '' ]]; then
gitDirty="true"
git --git-dir "${LEPTONGITPATH}" stash
fi
local gitDirty="$(file_stash ${LEPTONGITPATH})"
git --git-dir "${LEPTONGITPATH}" checkout "${Branch}"
git --git-dir "${LEPTONGITPATH}" pull --no-edit
if [ "${gitDirty}" == "true" ]; then
git --git-dir "${LEPTONGITPATH}" stash pop
fi
file_restore "${LEPTONGITPATH}" "${gitDirty}"
elif [ "${Type}" == "Local" ] || [ "${Type}" == "Release" ]; then
check_chrome_exist
clone_lepton