ソースを参照

fix build_service regexes to be easier to understand, bad replace

George Baugh 11 ヶ月 前
親
コミット
0c93fc8a0f
2 ファイル変更、6 行追加、4 行削除
  1. 5 3
      bin/build_service
  2. 1 1
      service/tpsgi.tmpl

+ 5 - 3
bin/build_service

@@ -6,8 +6,10 @@ REPLACEME=$(readlink -f $REPLACEME)
 # Make sure we start it with the *right* perl
 PERL5BIN=$(perl -V:scriptdir | sed -e "s/^scriptdir=//g;s/[';]//g")":$PATH"
 
-sed -e "s|__REPLACEME__|$REPLACEME|g;s|__PERL5BIN__|$PERL5BIN|g" $REPLACEME/service/tpsgi.tmpl > $REPLACEME/service/tpsgi.service.intermediate
-sed -e "s|__DOMAIN__|$DOMAIN|g" $REPLACEME/service/tpsgi.service.intermediate > $REPLACEME/service/tpsgi.service
-rm $REPLACEME/service/tpsgi.service.intermediate
+sed -e "s|__REPLACEME__|$REPLACEME|g" \
+    -e "s|__PERL5BIN__|$PERL5BIN|g" \
+    -e "s|__DOMAIN__|$DOMAIN|g" \
+    -e "s|__HOME__|$UHOME|g" \
+    $REPLACEME/service/tpsgi.tmpl > $REPLACEME/service/tpsgi.service
 
 echo "Wrote $REPLACEME/service/tpsgi.service"

+ 1 - 1
service/tpsgi.tmpl

@@ -9,7 +9,7 @@ WantedBy=multi-user.target
 [Service]
 Type=forking
 PIDFile=__REPLACEME__/run/tpsgi.pid
-Environment=PATH='__PERL5BIN__' HOME=__REPLACEME_/
+Environment=PATH='__PERL5BIN__' HOME=__REPLACEME__/
 ExecStart=__REPLACEME__/service/tpsgi.sh
 WorkingDirectory=__REPLACEME__/
 Restart=always