Procházet zdrojové kódy

Upate client to enable Parabola/Arch users

Bob Mottram před 8 roky
rodič
revize
1538234bf1
1 změnil soubory, kde provedl 48 přidání a 8 odebrání
  1. 48
    8
      src/freedombone-client

+ 48
- 8
src/freedombone-client Zobrazit soubor

@@ -58,23 +58,44 @@ SSH_HOST_KEY_ALGORITHMS=$(cat $MAIN_PROJECT_FILE | grep 'SSH_HOST_KEY_ALGORITHMS
58 58
 REFRESH_GPG_KEYS_HOURS=2
59 59
 
60 60
 function global_rate_limit {
61
-    sudo cp /etc/sysctl.conf ~/sysctl.conf
61
+    SYSCTL_FILE=/etc/sysctl.conf
62
+    if [ -f /usr/bin/pacman ]; then
63
+        SYSCTL_FILE=/etc/sysctl.d/99-sysctl.conf
64
+    fi
65
+    if [ ! -f $SYSCTL_FILE ]; then
66
+        sudo touch $SYSCTL_FILE
67
+    fi
68
+
69
+    sudo cp $SYSCTL_FILE ~/sysctl.conf
70
+    if [ ! -f /usr/bin/pacman ]; then
71
+        sudo chown $CURR_USER:$CURR_USER ~/sysctl.conf
72
+    else
73
+        sudo chown $CURR_USER:users ~/sysctl.conf
74
+    fi
62 75
     if ! grep -q "tcp_challenge_ack_limit" ~/sysctl.conf; then
63 76
         echo 'net.ipv4.tcp_challenge_ack_limit = 999999999' >> ~/sysctl.conf
64 77
     else
65 78
         sed -i 's|net.ipv4.tcp_challenge_ack_limit.*|net.ipv4.tcp_challenge_ack_limit = 999999999|g' ~/sysctl.conf
66 79
     fi
67
-    sudo cp ~/sysctl.conf /etc/sysctl.conf
80
+    sudo cp ~/sysctl.conf $SYSCTL_FILE
68 81
     sudo rm ~/sysctl.conf
69 82
     sudo sysctl -p
70 83
 }
71 84
 
72 85
 function refresh_gpg_keys {
73 86
     if [ ! -f /usr/bin/gpg ]; then
74
-        sudo apt-get -y install gnupg
87
+        if [ ! -f /usr/bin/pacman ]; then
88
+            sudo apt-get -y install gnupg
89
+        else
90
+            sudo pacman -S --noconfirm gnupg
91
+        fi
75 92
     fi
76 93
     sudo cp /etc/crontab ~/temp_crontab
77
-    sudo chown $CURR_USER:$CURR_USER ~/temp_crontab
94
+    if [ ! -f /usr/bin/pacman ]; then
95
+        sudo chown $CURR_USER:$CURR_USER ~/temp_crontab
96
+    else
97
+        sudo chown $CURR_USER:users ~/temp_crontab
98
+    fi
78 99
     if ! grep -q "gpg --refresh-keys" ~/temp_crontab; then
79 100
         echo "0            */$REFRESH_GPG_KEYS_HOURS *   *   *   $CURR_USER /usr/bin/gpg --refresh-keys > /dev/null" >> ~/temp_crontab
80 101
         sudo cp ~/temp_crontab /etc/crontab
@@ -97,7 +118,11 @@ function configure_ssh_client {
97 118
     sudo sed -i "s/#   MACs.*/   MACs $SSH_MACS/g" /etc/ssh/ssh_config
98 119
     if ! grep -q "HostKeyAlgorithms" /etc/ssh/ssh_config; then
99 120
         sudo cp /etc/ssh/ssh_config ~/ssh_config
100
-        sudo chown $CURR_USER:$CURR_USER ~/ssh_config
121
+        if [ ! -f /usr/bin/pacman ]; then
122
+            sudo chown $CURR_USER:$CURR_USER ~/ssh_config
123
+        else
124
+            sudo chown $CURR_USER:users ~/ssh_config
125
+        fi
101 126
         echo "   HostKeyAlgorithms $SSH_HOST_KEY_ALGORITHMS" >> ~/ssh_config
102 127
         sudo mv ~/ssh_config /etc/ssh/ssh_config
103 128
         sudo chown root:root /etc/ssh/ssh_config
@@ -105,7 +130,11 @@ function configure_ssh_client {
105 130
     sudo sed -i "s/Ciphers.*/Ciphers $SSH_CIPHERS/g" /etc/ssh/ssh_config
106 131
     if ! grep -q "Ciphers " /etc/ssh/ssh_config; then
107 132
         sudo cp /etc/ssh/ssh_config ~/ssh_config
108
-        sudo chown $CURR_USER:$CURR_USER ~/ssh_config
133
+        if [ ! -f /usr/bin/pacman ]; then
134
+            sudo chown $CURR_USER:$CURR_USER ~/ssh_config
135
+        else
136
+            sudo chown $CURR_USER:users ~/ssh_config
137
+        fi
109 138
         echo "   Ciphers $SSH_CIPHERS" >> ~/ssh_config
110 139
         sudo mv ~/ssh_config /etc/ssh/ssh_config
111 140
         sudo chown root:root /etc/ssh/ssh_config
@@ -113,7 +142,11 @@ function configure_ssh_client {
113 142
     sudo sed -i "s/MACs.*/MACs $SSH_MACS/g" /etc/ssh/ssh_config
114 143
     if ! grep -q "MACs " /etc/ssh/ssh_config; then
115 144
         sudo cp /etc/ssh/ssh_config ~/ssh_config
116
-        sudo chown $CURR_USER:$CURR_USER ~/ssh_config
145
+        if [ ! -f /usr/bin/pacman ]; then
146
+            sudo chown $CURR_USER:$CURR_USER ~/ssh_config
147
+        else
148
+            sudo chown $CURR_USER:users ~/ssh_config
149
+        fi
117 150
         echo "   MACs $SSH_MACS" >> ~/ssh_config
118 151
         sudo mv ~/ssh_config /etc/ssh/ssh_config
119 152
         sudo chown root:root /etc/ssh/ssh_config
@@ -156,6 +189,9 @@ function configure_ssh_client {
156 189
 }
157 190
 
158 191
 function configure_monkeysphere {
192
+    if [ -f /usr/bin/pacman ]; then
193
+        return
194
+    fi
159 195
     sudo apt-get -y install tor connect-proxy monkeysphere
160 196
 }
161 197
 
@@ -204,7 +240,11 @@ global_rate_limit
204 240
 configure_monkeysphere
205 241
 if [[ $MESH_CLIENT_INSTALL == $'yes' || $MESH_CLIENT_INSTALL == $'y' || $MESH_CLIENT_INSTALL == $'on' ]]; then
206 242
     echo $'Installing mesh packages'
207
-    sudo apt-get -y install avahi-utils avahi-autoipd avahi-dnsconfd
243
+    if [ ! -f /usr/bin/pacman ]; then
244
+        sudo apt-get -y install avahi-utils avahi-autoipd avahi-dnsconfd
245
+    else
246
+        sudo pacman -S --noconfirm avahi
247
+    fi
208 248
     sudo ${PROJECT_NAME}-mesh-install -f tox_node
209 249
     sudo ${PROJECT_NAME}-mesh-install -f toxic
210 250
     ${PROJECT_NAME}-mesh-install -f qtox