Skip to content
Snippets Groups Projects
Commit 3ef6e248 authored by Hahn Axel (hahn)'s avatar Hahn Axel (hahn)
Browse files

do not check json in target dir; shellfixes

parent ae669b15
No related branches found
No related tags found
1 merge request!1support custom phase per project
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
# #
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# 2013-11-06 axel.hahn@iml.unibe.ch # 2013-11-06 axel.hahn@iml.unibe.ch
# 2022-11-25 axel.hahn@unibe.ch do not check json in target dir; shellfixes
# ====================================================================== # ======================================================================
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
...@@ -41,8 +42,8 @@ ...@@ -41,8 +42,8 @@
echo echo
if [ $# -lt 2 ]; then if [ $# -lt 2 ]; then
echo Syntax is echo "Syntax is"
echo `basename $0` [webroot] [tgz-archive] [[deleteflag]] echo "$( basename $0 ) [webroot] [tgz-archive] [[deleteflag]]"
exit 1 exit 1
fi fi
...@@ -58,10 +59,12 @@ ...@@ -58,10 +59,12 @@
# see #2235 - for nodejs apps the target dir is different # see #2235 - for nodejs apps the target dir is different
# ls -ld $prjdir/public_html/ || ls -ld $prjdir/public/ || exit 2 # ls -ld $prjdir/public_html/ || ls -ld $prjdir/public/ || exit 2
# echo $prjdir | fgrep "/www/" || exit 2 # echo $prjdir | fgrep "/www/" || exit 2
ls -l $prjdir/*.json || exit 2
# skip this - aum spider has no json
# ls -l $prjdir/*.json || exit 2
# check tgz # check tgz
file $tgz | fgrep "gzip compressed" || exit 3 file $tgz | grep -F "gzip compressed" || exit 3
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# MAIN # MAIN
...@@ -97,9 +100,9 @@ ...@@ -97,9 +100,9 @@
bDelete=1 bDelete=1
testfile=$delfile testfile=$delfile
if [ ! -d $delfile ]; then if [ ! -d $delfile ]; then
testfile=`dirname $delfile` testfile=$( dirname $delfile )
fi fi
echo $testfile | fgrep -f $filelist >/dev/null echo $testfile | grep -F -f $filelist >/dev/null
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
echo KEEP: $delfile echo KEEP: $delfile
else else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment