CCF_100
/
PKGBUILDS
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TkgThingy: Add an option to reset trees in case of conflict

frogging-family
Tk-Glitch 2021-01-05 16:20:32 +07:00
parent 957e261077
commit 3719e635ae
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
TkgThingy
Unescape Escape View File

@ -107,7 +107,7 @@ _external_cfg() {
_main_loop() { _main_loop() {
echo -e "What do you want to do?" echo -e "What do you want to do?"
read -rp "`echo $' > 1.Create missing external config files\n 2.Update submodules\n 3.Exit\nchoice[1-3?]: '`" _choice; read -rp "`echo $' > 1.Create missing external config files\n 2.Update submodules\n 3.Reset & update submodules (for conflict fixing - ! will wipe any change vs remote !)\n 4.Exit\nchoice[1-4?]: '`" _choice;
if [ "$_choice" == "2" ]; then if [ "$_choice" == "2" ]; then
#git submodule update --remote #git submodule update --remote
for _tkg_tools in */; do for _tkg_tools in */; do
@ -116,6 +116,12 @@ _main_loop() {
fi fi
done done
elif [ "$_choice" == "3" ]; then elif [ "$_choice" == "3" ]; then
for _tkg_tools in */; do
if [ "$_tkg_tools" != ".git" ]; then
( cd "$_tkg_tools" && git config pull.rebase false && git reset --hard && git checkout master && git pull origin master )
fi
done
elif [ "$_choice" == "4" ]; then
exit 0 exit 0
else else
mkdir -p "$_EXT_CONFIG_PATH" mkdir -p "$_EXT_CONFIG_PATH"