iampeter/pixelplanet
1
Fork 0
forked from ppfun/pixelplanet
Code Pull Requests Activity

fix permission issues on githook

Browse Source
This commit is contained in:
HF 2022-06-19 18:06:01 +02:00
parent 6af530907a
commit c975ec57bf
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
deployment/githook.sh
View File

@ -12,7 +12,7 @@ DEVFOLDER="/home/pixelpla/pixelplanet-dev"
PFOLDER="/home/pixelpla/pixelplanet" PFOLDER="/home/pixelpla/pixelplanet"
should_reinstall () { should_reinstall () {
local TMPFILE="${BUILDDIR}/package.json.${branch}.tmp" local TMPFILE="${BUILDDIR}/package.json.${1}.tmp"
local NODEDIR="${BUILDDIR}/node_modules" local NODEDIR="${BUILDDIR}/node_modules"
local ORFILE="${BUILDDIR}/package.json" local ORFILE="${BUILDDIR}/package.json"
[ -f "${TMPFILE}" ] && [ -d "${NODEDIR}" ] && diff -q "${TMPFILE}" "${ORFILE}" && { [ -f "${TMPFILE}" ] && [ -d "${NODEDIR}" ] && diff -q "${TMPFILE}" "${ORFILE}" && {
@ -32,16 +32,16 @@ npm_reinstall () {
while read oldrev newrev refname while read oldrev newrev refname
do do
GIT_WORK_TREE="$BUILDDIR" GIT_DIR="${BUILDDIR}/.git" git fetch --all
cd "$BUILDDIR"
branch=$(git rev-parse --symbolic --abbrev-ref $refname) branch=$(git rev-parse --symbolic --abbrev-ref $refname)
if [ "production" == "$branch" ]; then if [ "production" == "$branch" ]; then
echo "---UPDATING REPO ON PRODUCTION SERVER---" echo "---UPDATING REPO ON PRODUCTION SERVER---"
GIT_WORK_TREE="$BUILDDIR" GIT_DIR="${BUILDDIR}/.git" git fetch --all
GIT_WORK_TREE="$BUILDDIR" GIT_DIR="${BUILDDIR}/.git" git reset --hard origin/production GIT_WORK_TREE="$BUILDDIR" GIT_DIR="${BUILDDIR}/.git" git reset --hard origin/production
COMMITS=`git log --pretty=format:'- %s%b' $newrev ^$oldrev` COMMITS=`git log --pretty=format:'- %s%b' $newrev ^$oldrev`
COMMITS=`echo "$COMMITS" | sed ':a;N;$!ba;s/\n/\\\n/g'` COMMITS=`echo "$COMMITS" | sed ':a;N;$!ba;s/\n/\\\n/g'`
echo "---BUILDING pixelplanet---" echo "---BUILDING pixelplanet---"
cd "$BUILDDIR" should_reinstall production
should_reinstall
DO_REINSTALL=$? DO_REINSTALL=$?
[ $DO_REINSTALL -eq 0 ] && npm_reinstall [ $DO_REINSTALL -eq 0 ] && npm_reinstall
npm run build npm run build
@ -64,17 +64,14 @@ do
pm2 start ecosystem-backup.yml pm2 start ecosystem-backup.yml
pm2 start ecosystem-captchas.yml pm2 start ecosystem-captchas.yml
else else
branch="dev"
echo "---UPDATING REPO ON DEV SERVER---" echo "---UPDATING REPO ON DEV SERVER---"
pm2 stop ppfun-server-dev pm2 stop ppfun-server-dev
pm2 stop ppfun-captchas-dev pm2 stop ppfun-captchas-dev
GIT_WORK_TREE="$BUILDDIR" GIT_DIR="${BUILDDIR}/.git" git fetch --all
GIT_WORK_TREE="$BUILDDIR" GIT_DIR="${BUILDDIR}/.git" git reset --hard "origin/$branch" GIT_WORK_TREE="$BUILDDIR" GIT_DIR="${BUILDDIR}/.git" git reset --hard "origin/$branch"
COMMITS=`git log --pretty=format:'- %s%b' $newrev ^$oldrev` COMMITS=`git log --pretty=format:'- %s%b' $newrev ^$oldrev`
COMMITS=`echo "$COMMITS" | sed ':a;N;$!ba;s/\n/\\\n/g'` COMMITS=`echo "$COMMITS" | sed ':a;N;$!ba;s/\n/\\\n/g'`
echo "---BUILDING pixelplanet---" echo "---BUILDING pixelplanet---"
cd "$BUILDDIR" should_reinstall dev
should_reinstall
DO_REINSTALL=$? DO_REINSTALL=$?
[ $DO_REINSTALL -eq 0 ] && npm_reinstall [ $DO_REINSTALL -eq 0 ] && npm_reinstall
nice -n 19 npm run build:dev nice -n 19 npm run build:dev