Skip to content

Commit a07c240

Browse files
committed
Try better bigcommunity compatibility
1 parent 642f3af commit a07c240

File tree

1 file changed

+28
-11
lines changed

1 file changed

+28
-11
lines changed

usr/share/bigbashview/apps/calamares/install.sh.htm

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,40 @@
2727
> /tmp/start_calamares
2828
fi
2929

30+
31+
###### Detecting folder with sfs files
32+
# Try with manjaro folder
33+
if [[ -e /run/miso/bootmnt/manjaro/x86_64/ ]]; then
34+
sfsFolder=manjaro
35+
36+
# Try with folder same as HOSTNAME
37+
elif [[ -e /run/miso/bootmnt/$HOSTNAME/x86_64/ ]]; then
38+
sfsFolder="$HOSTNAME"
39+
40+
# Try folder removing efi and boot folder
41+
elif [[ -e $(ls -d1 /run/miso/bootmnt/*/ | grep -ve '/efi/' -ve '/boot/') ]]; then
42+
sfsFolder="$(ls -d1 /run/miso/bootmnt/*/ | grep -ve '/efi/' -ve '/boot/')"
43+
fi
44+
######
45+
46+
3047
if [ "$use_custom_desktop" = "yes" ]; then
31-
echo '---
48+
echo "---
3249
unpack:
33-
- source: "/run/miso/bootmnt/manjaro/x86_64/rootfs.sfs"
34-
sourcefs: "squashfs"
35-
destination: ""' > /etc/calamares/modules/unpackfs.conf
50+
- source: \"/run/miso/bootmnt/$sfsFolder/x86_64/rootfs.sfs\"
51+
sourcefs: \"squashfs\"
52+
destination: \"\"" > /etc/calamares/modules/unpackfs.conf
3653

3754
else
3855

39-
echo '---
56+
echo "---
4057
unpack:
41-
- source: "/run/miso/bootmnt/manjaro/x86_64/rootfs.sfs"
42-
sourcefs: "squashfs"
43-
destination: ""
44-
- source: "/run/miso/bootmnt/manjaro/x86_64/desktopfs.sfs"
45-
sourcefs: "squashfs"
46-
destination: ""' > /etc/calamares/modules/unpackfs.conf
58+
- source: \"/run/miso/bootmnt/$sfsFolder/x86_64/rootfs.sfs\"
59+
sourcefs: \"squashfs\"
60+
destination: \"\"
61+
- source: \"/run/miso/bootmnt/$sfsFolder/x86_64/desktopfs.sfs\"
62+
sourcefs: \"squashfs\"
63+
destination: \"\"" > /etc/calamares/modules/unpackfs.conf
4764
fi
4865

4966
if [ -e "/etc/calamares/modules/packages.conf" ];then

0 commit comments

Comments
 (0)