From f8307b8897dba0c01f617b2512ee5a0c217c41e1 Mon Sep 17 00:00:00 2001
From: illiliti <illiliti@protonmail.com>
Date: Sat, 18 Apr 2020 11:21:28 +0300
Subject: [PATCH] fix issues

---
 tinyramfs                | 10 ++++++----
 usr/share/tinyramfs/init |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/tinyramfs b/tinyramfs
index 14ac20a..383a19e 100755
--- a/tinyramfs
+++ b/tinyramfs
@@ -110,7 +110,7 @@ install_requirements()
     info "installing requirements"
 
     # install user specified and required binaries
-    for _binary in $binaries \[ sh sleep mount printf setsid switch_root; do
+    for _binary in $binaries \[ sh ln sleep mount printf setsid switch_root; do
         install_binary "$_binary"
     done
 
@@ -161,7 +161,7 @@ install_devmgr()
 
     install_devmgr_helper()
     {
-        for _binary in ln kill mkdir blkid "${filesdir}/device-helper"; do
+        for _binary in kill mkdir blkid "${filesdir}/device-helper"; do
             install_binary "$_binary"
         done
 
@@ -404,7 +404,8 @@ install_binary()
     # iterate throught symlinks and copy them
     while [ -h "$binary" ]; do
         cp -P "$binary" "$workdirbin"
-        binary="${binary%/*}/$(readlink "$binary")"
+        readlink_binary=$(readlink "$binary")
+        binary="${binary%/*}/${readlink_binary##*/}"
     done
 
     install -m755 "$binary" "${workdirbin}${binary##*/}"
@@ -437,7 +438,8 @@ install_library()
     # iterate throught symlinks and copy them
     while [ -h "$library" ]; do
         cp -P "$library" "$workdirlib"
-        library="${library%/*}/$(readlink "$library")"
+        readlink_library=$(readlink "$library")
+        library="${library%/*}/${readlink_library##*/}"
     done
 
     install -m755 "$library" "${workdirlib}${library##*/}"
diff --git a/usr/share/tinyramfs/init b/usr/share/tinyramfs/init
index 1b46dbe..0c335ee 100755
--- a/usr/share/tinyramfs/init
+++ b/usr/share/tinyramfs/init
@@ -71,7 +71,7 @@ prepare_environment()
 
     trap 'panic "something went wrong"' EXIT
 
-    [ "$modules" ] && modprobe -a "$modules"
+    [ "$modules" ] && modprobe -a "$modules" ||:
 }
 
 parse_cmdline()