Browse Source

invert logic

Bob Mottram 8 years ago
parent
commit
22b90f4cab
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      src/freedombone-app-gogs
  2. 1
    1
      src/freedombone-utils-go

+ 2
- 2
src/freedombone-app-gogs View File

456
     echo "ExecStart=/home/$GOGS_USERNAME/gogs web" >> /etc/systemd/system/gogs.service
456
     echo "ExecStart=/home/$GOGS_USERNAME/gogs web" >> /etc/systemd/system/gogs.service
457
     echo 'Restart=always' >> /etc/systemd/system/gogs.service
457
     echo 'Restart=always' >> /etc/systemd/system/gogs.service
458
     echo 'RestartSec=10' >> /etc/systemd/system/gogs.service
458
     echo 'RestartSec=10' >> /etc/systemd/system/gogs.service
459
-    echo "Environment=\"USER=$GOGS_USERNAME\" \"HOME=/home/$GOGS_USERNAME\" \"GOPATH=$GOPATH\" \"GVM_ROOT=$GVM_HOME\"" >> /etc/systemd/system/gogs.service
459
+    echo "Environment=\"USER=$GOGS_USERNAME\" \"HOME=/home/$GOGS_USERNAME\" \"GOPATH=/home/go/go${GO_VERSION}\"" >> /etc/systemd/system/gogs.service
460
     echo '' >> /etc/systemd/system/gogs.service
460
     echo '' >> /etc/systemd/system/gogs.service
461
     echo '[Install]' >> /etc/systemd/system/gogs.service
461
     echo '[Install]' >> /etc/systemd/system/gogs.service
462
     echo 'WantedBy=multi-user.target' >> /etc/systemd/system/gogs.service
462
     echo 'WantedBy=multi-user.target' >> /etc/systemd/system/gogs.service
463
 
463
 
464
     systemctl enable gogs
464
     systemctl enable gogs
465
     systemctl daemon-reload
465
     systemctl daemon-reload
466
-    systemctl restart gogs
466
+    systemctl start gogs
467
 
467
 
468
     if [ ! -d /var/www/$GIT_DOMAIN_NAME ]; then
468
     if [ ! -d /var/www/$GIT_DOMAIN_NAME ]; then
469
         mkdir /var/www/$GIT_DOMAIN_NAME
469
         mkdir /var/www/$GIT_DOMAIN_NAME

+ 1
- 1
src/freedombone-utils-go View File

197
         return
197
         return
198
     fi
198
     fi
199
 
199
 
200
-    if ! grep -Fxq "upgrade_golang:$GO_VERSION" $COMPLETION_FILE; then
200
+    if grep -Fxq "upgrade_golang:$GO_VERSION" $COMPLETION_FILE; then
201
         return
201
         return
202
     fi
202
     fi
203
 
203