diff --git a/README.html b/README.html
index 336884f..23e97f4 100644
--- a/README.html
+++ b/README.html
@@ -680,7 +680,7 @@
Credits
Author: | Chris Magyar |
-Version: | 1.1.4 |
+
---|
Version: | 1.1.5 |
License: | GPL 3.0 |
diff --git a/README.rst b/README.rst
index 190dfa3..4dae360 100644
--- a/README.rst
+++ b/README.rst
@@ -172,7 +172,7 @@ by several inquisitive `forum posts`_.
Chris Magyar
:Version:
- 1.1.4
+ 1.1.5
:License:
GPL 3.0
diff --git a/lib/man/ramroot.8 b/lib/man/ramroot.8
index f3b4094..7ab0777 100644
--- a/lib/man/ramroot.8
+++ b/lib/man/ramroot.8
@@ -1,4 +1,4 @@
-.TH RAMROOT 8 "November 2017" "ramroot 1.1.4" "Ramroot Manual"
+.TH RAMROOT 8 "November 2017" "ramroot 1.1.5" "Ramroot Manual"
.SH NAME
ramroot \- load root filesystem entirely to RAM during boot
.SH SYNOPSIS
diff --git a/ramroot b/ramroot
index 0604ed2..6a78bd9 100755
--- a/ramroot
+++ b/ramroot
@@ -2,7 +2,7 @@
##============================== ramroot ===============================##
# Copyright (C) 2018 Chris Magyar GNU General Public License v3 #
##========================================================================##
-version="1.1.4"
+version="1.1.5"
print_help() {
cat <<'HELPDOC'
@@ -177,17 +177,17 @@ ramroot_enable() {
# add zram to initMODULES:
if [[ ! "$initMODULES" =~ zram ]]; then
- if [ "$initMODULES" = 'MODULES=""' ]; then
- initMODULES='MODULES="zram"'
+ if [ -z "$initMODULES" ]; then
+ initMODULES='zram'
else
- initMODULES="${initMODULES%*\"} zram\""
+ initMODULES="${initMODULES} zram"
fi
printf ":: zram added to mkinitcpio.conf MODULES\n"
mkinitChange='true'
fi
# add ext4 to initMODULES:
if [[ ! "$initMODULES" =~ ext4 ]]; then
- initMODULES="${initMODULES%*\"} ext4\""
+ initMODULES="${initMODULES} ext4"
printf ":: ext4 added to mkinitcpio.conf MODULES\n"
mkinitChange='true'
fi
@@ -201,8 +201,8 @@ ramroot_enable() {
# if changes need to be made:
if [ "$mkinitChange" = 'true' ] || [ "$dryRun" = 'true' ]; then
# build new mkinitcpio.conf:
- sed "s@^MODULES=.*@$initMODULES@g; \
- s@^HOOKS=.*@$initHOOKS@g;" \
+ sed "s@^MODULES=.*@MODULES=($initMODULES)@g; \
+ s@^HOOKS=.*@HOOKS=($initHOOKS)@g;" \
/etc/mkinitcpio.conf > mkinitcpio.conf
# FAIL: mkinitcpio.conf not built:
if [ ! -f mkinitcpio.conf ]; then
@@ -265,8 +265,8 @@ ramroot_disable() {
cp /etc/mkinitcpio.conf "$dirCache/mkinitcpio~.conf"
fi
# build new mkinitcpio.conf:
- sed "s@^MODULES=.*@$initMODULES@g; \
- s@^HOOKS=.*@$initHOOKS@g;" \
+ sed "s@^MODULES=.*@MODULES=($initMODULES)@g; \
+ s@^HOOKS=.*@HOOKS=($initHOOKS)@g;" \
/etc/mkinitcpio.conf > mkinitcpio.conf
# FAIL: mkinitcpio.conf not built:
if [ ! -f mkinitcpio.conf ]; then
@@ -405,8 +405,8 @@ cd "$dirBuild"
sudo -k
# get current MODULES and HOOKS from /etc/mkinitcpio.conf:
-initMODULES=`grep -P '^ *MODULES=' /etc/mkinitcpio.conf`
-initHOOKS=`grep -P '^ *HOOKS=' /etc/mkinitcpio.conf`
+initMODULES="`grep -Po '^ *MODULES=\(\K.*?(?=\))' /etc/mkinitcpio.conf`"
+initHOOKS="`grep -Po '^ *HOOKS=\(\K.*?(?=\))' /etc/mkinitcpio.conf`"
# execute action:
if [ "$ramrootAction" = 'enable' ]; then