More install fixes, correct nasajobsbot.timer

dkozinn · Dec 16, 2023 · a842de6 · a842de6
1 parent ee8a8da
commit a842de6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/install.sh b/install.sh
@@ -24,15 +24,16 @@ for service in $(cat services)
 do
     export service
     sudo -E bash -c "sed 's@USER@$user@;s@HOME@$user@' $service.service  > $SYSTEM/$service.service"
-    sudo -E bash -c "[[ -f $service.timer ]] && cp $service.timer $SYSTEM"
-    sudo -E cp src/$service.py $BIN
+    [[ -f $service.timer ]] && sudo cp $service.timer $SYSTEM
+    sudo cp src/$service.py $BIN
 done
 
-sudo -E bash -c "cp nasabot.logrotate $LOGDIR"
+sudo cp nasabot.logrotate $LOGDIR
 
 sudo $SYSTEMCTL daemon-reload
 for service in $(cat services)
 do
+    [[ -f $service.timer ]] && service = $service.timer
     sudo $SYSTEMCTL enable $service
     sudo $SYSTEMCTL restart $service
 done

diff --git a/nasajobsbot.timer b/nasajobsbot.timer
@@ -6,7 +6,7 @@ Requires=nasajobsbot.service
 
 [Timer]
 Unit=nasajobsbot.service
-OnCalendar=* *-*-* 06:00:00
+OnCalendar=*-*-* 06:00:00
 
 [Install]
 WantedBy=timers.target