highperfocused/raspiblitz
1
0
Fork 0
mirror of https://github.com/raspiblitz/raspiblitz.git synced 2025-09-27 12:06:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

github patch always clean

Browse Source
This commit is contained in:
rootzoll
2021-12-19 23:04:49 +01:00
parent 7770efbde9
commit 13be394f51
2 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
home.admin/99updateMenu.sh
View File

@@ -166,7 +166,7 @@ patch()
newGitHubUser=$(echo "${newGitHubUser}" | cut -d " " -f1) newGitHubUser=$(echo "${newGitHubUser}" | cut -d " " -f1)
echo "--> " ${newGitHubUser} echo "--> " ${newGitHubUser}
error="" error=""
source <(sudo -u admin /home/admin/config.scripts/blitz.github.sh -clean ${activeBranch} ${newGitHubUser}) source <(sudo -u admin /home/admin/config.scripts/blitz.github.sh ${activeBranch} ${newGitHubUser})
if [ ${#error} -gt 0 ]; then if [ ${#error} -gt 0 ]; then
whiptail --title "ERROR" --msgbox "${error}" 8 30 whiptail --title "ERROR" --msgbox "${error}" 8 30
fi fi

36
home.admin/config.scripts/blitz.github.sh
View File

@@ -11,7 +11,7 @@ if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ "$1" = "-help" ];
echo "FOR DEVELOPMENT USE ONLY!" echo "FOR DEVELOPMENT USE ONLY!"
echo "RaspiBlitz Sync Scripts" echo "RaspiBlitz Sync Scripts"
echo "blitz.github.sh info" echo "blitz.github.sh info"
echo "blitz.github.sh [-run|-clean|-install|-justinstall] branch [repo]" echo "blitz.github.sh [-run|-install|-justinstall] branch [repo]"
exit 1 exit 1
fi fi
@@ -52,11 +52,6 @@ if [ "${wantedBranch}" = "-run" ]; then
vagrant=0 vagrant=0
fi fi
fi fi
if [ "${wantedBranch}" = "-clean" ]; then
clean=1
wantedBranch="$2"
wantedGitHubUser="$3"
fi
if [ "${wantedBranch}" = "-install" ]; then if [ "${wantedBranch}" = "-install" ]; then
install=1 install=1
wantedBranch="$2" wantedBranch="$2"
@@ -151,28 +146,25 @@ else
sudo chown admin:admin -R /home/admin/raspiblitz sudo chown admin:admin -R /home/admin/raspiblitz
fi fi
if [ ${clean} -eq 1 ]; then
echo "# Cleaning scripts and assets .. "
sudo rm -f *.sh
sudo rm -rf assets
sudo rm -rf /home/admin/config.scripts
sudo rm -rf /home/admin/setup.scripts
else
echo "# ******************************************"
echo "# NOT cleaning/deleting old files"
echo "# use parameter '-clean' if you want that next time"
echo "# ******************************************"
fi
echo "# COPYING from GIT-Directory to /home/admin/" echo "# COPYING from GIT-Directory to /home/admin/"
# basic admin files
sudo rm -f *.sh
sudo -u admin cp /home/admin/raspiblitz/home.admin/.tmux.conf /home/admin sudo -u admin cp /home/admin/raspiblitz/home.admin/.tmux.conf /home/admin
sudo -u admin cp -R /home/admin/raspiblitz/home.admin/assets /home/admin/
sudo -u admin cp /home/admin/raspiblitz/home.admin/*.* /home/admin sudo -u admin cp /home/admin/raspiblitz/home.admin/*.* /home/admin
sudo -u admin chmod 755 *.sh sudo -u admin chmod 755 *.sh
sudo -u admin cp -R /home/admin/raspiblitz/home.admin/config.scripts /home/admin/ # asset directory
sudo rm -rf assets
sudo -u admin cp -R /home/admin/raspiblitz/home.admin/assets /home/admin/assets
# config.scripts directory
sudo rm -rf /home/admin/config.scripts
sudo -u admin cp -R /home/admin/raspiblitz/home.admin/config.scripts /home/admin/config.scripts
sudo -u admin chmod 755 /home/admin/config.scripts/*.sh sudo -u admin chmod 755 /home/admin/config.scripts/*.sh
sudo -u admin cp -R /home/admin/raspiblitz/home.admin/setup.scripts /home/admin/ sudo -u admin chmod 755 /home/admin/config.scripts/*.py
# setup.scripts directory
sudo rm -rf /home/admin/setup.scripts
sudo -u admin cp -R /home/admin/raspiblitz/home.admin/setup.scripts /home/admin/setup.scripts
sudo -u admin chmod 755 /home/admin/setup.scripts/*.sh sudo -u admin chmod 755 /home/admin/setup.scripts/*.sh
sudo -u admin chmod 755 /home/admin/config.scripts/*.py
echo "# ******************************************" echo "# ******************************************"
echo "# Syncing Webcontent .." echo "# Syncing Webcontent .."