Bläddra i källkod

Double quotes

Bob Mottram 8 år sedan
förälder
incheckning
997b723d6c
2 ändrade filer med 9 tillägg och 3 borttagningar
  1. 2
    2
      src/freedombone-app-gogs
  2. 7
    1
      src/freedombone-client

+ 2
- 2
src/freedombone-app-gogs Visa fil

454
     echo 'Type=simple' >> /etc/systemd/system/gogs.service
454
     echo 'Type=simple' >> /etc/systemd/system/gogs.service
455
     echo 'User=gogs' >> /etc/systemd/system/gogs.service
455
     echo 'User=gogs' >> /etc/systemd/system/gogs.service
456
     echo 'Group=some_group' >> /etc/systemd/system/gogs.service
456
     echo 'Group=some_group' >> /etc/systemd/system/gogs.service
457
-    echo 'WorkingDirectory=/home/$GOGS_USERNAME' >> /etc/systemd/system/gogs.service
458
-    echo 'ExecStart=/home/$GOGS_USERNAME/gogs web' >> /etc/systemd/system/gogs.service
457
+    echo "WorkingDirectory=/home/$GOGS_USERNAME" >> /etc/systemd/system/gogs.service
458
+    echo "ExecStart=/home/$GOGS_USERNAME/gogs web" >> /etc/systemd/system/gogs.service
459
     echo 'Restart=always' >> /etc/systemd/system/gogs.service
459
     echo 'Restart=always' >> /etc/systemd/system/gogs.service
460
     echo 'RestartSec=10' >> /etc/systemd/system/gogs.service
460
     echo 'RestartSec=10' >> /etc/systemd/system/gogs.service
461
     echo "Environment=\"USER=$GOGS_USERNAME\" \"HOME=/home/$GOGS_USERNAME\" \"GOPATH=$GOPATH\" \"GVM_ROOT=$GVM_HOME\"" >> /etc/systemd/system/gogs.service
461
     echo "Environment=\"USER=$GOGS_USERNAME\" \"HOME=/home/$GOGS_USERNAME\" \"GOPATH=$GOPATH\" \"GVM_ROOT=$GVM_HOME\"" >> /etc/systemd/system/gogs.service

+ 7
- 1
src/freedombone-client Visa fil

108
 }
108
 }
109
 
109
 
110
 function configure_ssh_client {
110
 function configure_ssh_client {
111
+    if [ -f /usr/bin/pacman ]; then
112
+        sudo pacman -S proxytunnel
113
+    else
114
+        sudo apt-get -y install tor connect-proxy
115
+    fi
116
+
111
     #sudo sed -i 's/#   PasswordAuthentication.*/   PasswordAuthentication no/g' /etc/ssh/ssh_config
117
     #sudo sed -i 's/#   PasswordAuthentication.*/   PasswordAuthentication no/g' /etc/ssh/ssh_config
112
     #sudo sed -i 's/#   ChallengeResponseAuthentication.*/   ChallengeResponseAuthentication no/g' /etc/ssh/ssh_config
118
     #sudo sed -i 's/#   ChallengeResponseAuthentication.*/   ChallengeResponseAuthentication no/g' /etc/ssh/ssh_config
113
     sudo sed -i "s/#   HostKeyAlgorithms.*/   HostKeyAlgorithms $SSH_HOST_KEY_ALGORITHMS/g" /etc/ssh/ssh_config
119
     sudo sed -i "s/#   HostKeyAlgorithms.*/   HostKeyAlgorithms $SSH_HOST_KEY_ALGORITHMS/g" /etc/ssh/ssh_config
180
     if [ -f /usr/bin/pacman ]; then
186
     if [ -f /usr/bin/pacman ]; then
181
         return
187
         return
182
     fi
188
     fi
183
-    sudo apt-get -y install tor connect-proxy monkeysphere
189
+    sudo apt-get -y install monkeysphere
184
 }
190
 }
185
 
191
 
186
 function show_help {
192
 function show_help {