adminconf/conf-sync
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix error in previous merge conflict resolution

Browse Source
This commit is contained in:
Alexandre CATTEAU 2022-07-24 15:27:54 +02:00
parent d2d323b150
commit dd0f0e115d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install.sh
View File

@ -19,7 +19,7 @@ if [ -e /run/systemd/system ]; then # service manager is Systemd
sudo cp systemd-templates/conf-sync.service /etc/systemd/system/ sudo cp systemd-templates/conf-sync.service /etc/systemd/system/
sudo sed -i -e "s/PH_USER/$(whoami)/g" /etc/systemd/system/conf-sync.service sudo sed -i -e "s/PH_USER/$(whoami)/g" /etc/systemd/system/conf-sync.service
sudo sed -i -e "s:PH_DIRECTORY:$(pwd):g" /etc/systemd/system/conf-sync.service sudo sed -i -e "s:PH_DIRECTORY:$(pwd):g" /etc/systemd/system/conf-sync.service
if $client_type == "server"; then if [ "$client_type" = "server" ]; then
sudo cp systemd-templates/conf-sync-server.timer /etc/systemd/system/conf-sync.timer sudo cp systemd-templates/conf-sync-server.timer /etc/systemd/system/conf-sync.timer
else else
sudo cp systemd-templates/conf-sync-desktop.timer /etc/systemd/system/conf-sync.timer sudo cp systemd-templates/conf-sync-desktop.timer /etc/systemd/system/conf-sync.timer
@ -28,7 +28,7 @@ if [ -e /run/systemd/system ]; then # service manager is Systemd
cp systemd-templates/conf-sync.service /etc/systemd/system/ cp systemd-templates/conf-sync.service /etc/systemd/system/
sed -i -e "s/PH_USER/$(whoami)/g" /etc/systemd/system/conf-sync.service sed -i -e "s/PH_USER/$(whoami)/g" /etc/systemd/system/conf-sync.service
sed -i -e "s:PH_DIRECTORY:$(pwd):g" /etc/systemd/system/conf-sync.service sed -i -e "s:PH_DIRECTORY:$(pwd):g" /etc/systemd/system/conf-sync.service
if $client_type == "server"; then if [ "$client_type" = "server" ]; then
cp systemd-templates/conf-sync-server.timer /etc/systemd/system/conf-sync.timer cp systemd-templates/conf-sync-server.timer /etc/systemd/system/conf-sync.timer
else else
cp systemd-templates/conf-sync-desktop.timer /etc/systemd/system/conf-sync.timer cp systemd-templates/conf-sync-desktop.timer /etc/systemd/system/conf-sync.timer