Bob Mottram 7 gadus atpakaļ
vecāks
revīzija
ad8d266452
2 mainītis faili ar 27 papildinājumiem un 28 dzēšanām
  1. 8
    8
      src/freedombone-vars
  2. 19
    20
      src/freedombone-zram

+ 8
- 8
src/freedombone-vars Parādīt failu

28
 # You should have received a copy of the GNU Affero General Public License
28
 # You should have received a copy of the GNU Affero General Public License
29
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
29
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
30
 
30
 
31
-DEFAULT_LANGUAGE=$(echo $LANG)
31
+DEFAULT_LANGUAGE=$LANG
32
 
32
 
33
-if [ ! $PROJECT_NAME ]; then
33
+if [ ! "$PROJECT_NAME" ]; then
34
     PROJECT_NAME='freedombone'
34
     PROJECT_NAME='freedombone'
35
 fi
35
 fi
36
 
36
 
81
 SOCIALINSTANCE=
81
 SOCIALINSTANCE=
82
 
82
 
83
 # include utils
83
 # include utils
84
-UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
84
+UTILS_FILES="/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*"
85
 for f in $UTILS_FILES
85
 for f in $UTILS_FILES
86
 do
86
 do
87
-    source $f
87
+    source "$f"
88
 done
88
 done
89
 
89
 
90
 # include base system apps
90
 # include base system apps
91
-BASE_SYSTEM_FILES=/usr/share/${PROJECT_NAME}/base/${PROJECT_NAME}-base-*
91
+BASE_SYSTEM_FILES="/usr/share/${PROJECT_NAME}/base/${PROJECT_NAME}-base-*"
92
 for f in $BASE_SYSTEM_FILES
92
 for f in $BASE_SYSTEM_FILES
93
 do
93
 do
94
-    source $f
94
+    source "$f"
95
 done
95
 done
96
 
96
 
97
 #include apps
97
 #include apps
98
-APP_FILES=/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*
98
+APP_FILES="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-*"
99
 for f in $APP_FILES
99
 for f in $APP_FILES
100
 do
100
 do
101
-    source $f
101
+    source "$f"
102
 done
102
 done
103
 
103
 
104
 # optionally specify your name to appear on the blog
104
 # optionally specify your name to appear on the blog

+ 19
- 20
src/freedombone-zram Parādīt failu

36
 DAEMON_FILENAME=/etc/systemd/system/zram.service
36
 DAEMON_FILENAME=/etc/systemd/system/zram.service
37
 
37
 
38
 function zram_daemon {
38
 function zram_daemon {
39
-  echo '[Unit]' > $DAEMON_FILENAME
40
-  echo 'Description=Zeronet Server' >> $DAEMON_FILENAME
41
-  echo 'After=syslog.target' >> $DAEMON_FILENAME
42
-  echo 'After=network.target' >> $DAEMON_FILENAME
43
-  echo '[Service]' >> $DAEMON_FILENAME
44
-  echo 'Type=simple' >> $DAEMON_FILENAME
45
-  echo 'User=zram' >> $DAEMON_FILENAME
46
-  echo 'Group=zram' >> $DAEMON_FILENAME
47
-  echo 'WorkingDirectory=' >> $DAEMON_FILENAME
48
-  echo "ExecStart=${PROJECT_NAME}-zram on" >> $DAEMON_FILENAME
49
-  echo '' >> $DAEMON_FILENAME
50
-  echo '[Install]' >> $DAEMON_FILENAME
51
-  echo 'WantedBy=multi-user.target' >> $DAEMON_FILENAME
52
-
39
+    { echo '[Unit]';
40
+      echo 'Description=Zeronet Server';
41
+      echo 'After=syslog.target';
42
+      echo 'After=network.target';
43
+      echo '[Service]';
44
+      echo 'Type=simple';
45
+      echo 'User=zram';
46
+      echo 'Group=zram';
47
+      echo 'WorkingDirectory=';
48
+      echo "ExecStart=${PROJECT_NAME}-zram on";
49
+      echo '';
50
+      echo '[Install]';
51
+      echo 'WantedBy=multi-user.target'; } >> $DAEMON_FILENAME
53
 }
52
 }
54
 
53
 
55
 function zram_on {
54
 function zram_on {
76
 
75
 
77
         # initialize the devices
76
         # initialize the devices
78
         for i in $(seq 0 $decr_num_cpus); do
77
         for i in $(seq 0 $decr_num_cpus); do
79
-            echo $((mem_total / num_cpus)) > /sys/block/zram$i/disksize
78
+            echo $((mem_total / num_cpus)) > "/sys/block/zram$i/disksize"
80
         done
79
         done
81
 
80
 
82
         # Creating swap filesystems
81
         # Creating swap filesystems
83
         for i in $(seq 0 $decr_num_cpus); do
82
         for i in $(seq 0 $decr_num_cpus); do
84
-            mkswap /dev/zram$i
83
+            mkswap "/dev/zram$i"
85
         done
84
         done
86
 
85
 
87
         # Switch the swaps on
86
         # Switch the swaps on
88
         for i in $(seq 0 $decr_num_cpus); do
87
         for i in $(seq 0 $decr_num_cpus); do
89
-            swapon -p 100 /dev/zram$i
88
+            swapon -p 100 "/dev/zram$i"
90
         done
89
         done
91
 
90
 
92
         zram_daemon
91
         zram_daemon
103
 
102
 
104
         # Switching off swap
103
         # Switching off swap
105
         for i in $(seq 0 $decr_num_cpus); do
104
         for i in $(seq 0 $decr_num_cpus); do
106
-            if [ "$(grep /dev/zram$i /proc/swaps)" != "" ]; then
107
-                swapoff /dev/zram$i
105
+            if [ "$(grep "/dev/zram$i" /proc/swaps)" != "" ]; then
106
+                swapoff "/dev/zram$i"
108
                 sleep 1
107
                 sleep 1
109
             fi
108
             fi
110
         done
109
         done
123
     exit 0
122
     exit 0
124
 }
123
 }
125
 
124
 
126
-if [ ! $1 ]; then
125
+if [ ! "$1" ]; then
127
     show_help
126
     show_help
128
 else
127
 else
129
     if [[ "$1" == "on" || "$1" == "enable" || "$1" == "yes" ]]; then
128
     if [[ "$1" == "on" || "$1" == "enable" || "$1" == "yes" ]]; then