@@ -915,12 +915,10 @@ DeployWar()
915
915
FatalError " Web Application Installation FAILED"
916
916
fi
917
917
918
- # Fix for opengrok issue https://github.com/OpenGrok/OpenGrok/issues/863
919
918
# If user does not use default OPENGROK_INSTANCE_BASE or default
920
919
# WEBAPP_CONFIG_ADDRESS, then attempt to extract WEB-INF/web.xml from
921
920
# source.war using jar or zip utility, update the hardcoded values and
922
921
# then update source.war with the new WEB-INF/web.xml
923
-
924
922
if [ " ${OPENGROK_INSTANCE_BASE} " != ' /var/opengrok' ] || [ " ${WEBAPP_CONFIG_ADDRESS} " != ' localhost:2424' ]
925
923
then
926
924
EXTRACT_COMMAND=" "
@@ -941,11 +939,19 @@ DeployWar()
941
939
eval " ${EXTRACT_COMMAND} ${warTarget} /source.war WEB-INF/web.xml"
942
940
if [ " ${OPENGROK_INSTANCE_BASE} " != ' /var/opengrok' ]
943
941
then
944
- sed -i -e ' s:/var/opengrok/etc/configuration.xml:' " $XML_CONFIGURATION " ' :g' " ${warTarget} /WEB-INF/web.xml"
942
+ sed -e ' s:/var/opengrok/etc/configuration.xml:' " $XML_CONFIGURATION " ' :g' \
943
+ " ${warTarget} /WEB-INF/web.xml" \
944
+ > " ${warTarget} /WEB-INF/web.xml.tmp"
945
+ mv " ${warTarget} /WEB-INF/web.xml.tmp" \
946
+ " ${warTarget} /WEB-INF/web.xml"
945
947
fi
946
948
if [ " ${WEBAPP_CONFIG_ADDRESS} " != ' localhost:2424' ]
947
949
then
948
- sed -i -e ' s/localhost:2424/' " $WEBAPP_CONFIG_ADDRESS " ' /g' " ${warTarget} /WEB-INF/web.xml"
950
+ sed -e ' s/localhost:2424/' " $WEBAPP_CONFIG_ADDRESS " ' /g' \
951
+ " ${warTarget} /WEB-INF/web.xml" \
952
+ > " ${warTarget} /WEB-INF/web.xml.tmp"
953
+ mv " ${warTarget} /WEB-INF/web.xml.tmp" \
954
+ " ${warTarget} /WEB-INF/web.xml"
949
955
fi
950
956
eval " ${COMPRESS_COMMAND} ${warTarget} /source.war WEB-INF/web.xml"
951
957
rm -rf " ${warTarget} /WEB-INF"
0 commit comments