mirror of
https://github.com/stefanpejcic/openpanel
synced 2025-06-26 18:28:26 +00:00
Update UPDATE.sh
This commit is contained in:
parent
d83cd3dffa
commit
a309feedfc
@ -151,7 +151,25 @@ print_space_and_line() {
|
||||
|
||||
update_configuration_files() {
|
||||
echo "Updating configuration files in /etc/openpanel/"
|
||||
cd /etc/openpanel && git pull
|
||||
cd /etc/openpanel/
|
||||
|
||||
git stash # stash local conf
|
||||
|
||||
# update from gh
|
||||
if git pull origin main; then
|
||||
echo "Successfully pulled the latest changes."
|
||||
else
|
||||
echo "There were merge conflicts."
|
||||
if git ls-files -u | grep -q "^"; then
|
||||
echo "Conflicted files:"
|
||||
git ls-files -u
|
||||
else
|
||||
echo "No conflicts, but pull failed for another reason."
|
||||
fi
|
||||
fi
|
||||
|
||||
git stash pop # restore local conf
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user