Skip to content

Commit 09d668c

Browse files
committed
add support for 7z archives
1 parent e3bc65a commit 09d668c

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

build/meta/extra-build-tools.p5m

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ set name=pkg.description value="Tools required to build OmniOS extra"
44

55
depend fmri=ooce/omnios-build-tools type=require
66

7+
depend fmri=compress/7zip type=require
78
depend fmri=compress/lz4 type=require
89
depend fmri=driver/tuntap type=require
910
depend fmri=library/unixodbc type=require

lib/config.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ else
142142
fi
143143
BRAICH_REPO=https://pkg.omnios.org/bloody/braich
144144

145-
ARCHIVE_TYPES="tar.zst tar.xz tar.bz2 tar.lz tar.gz tgz tar zip"
145+
ARCHIVE_TYPES="tar.zst tar.xz tar.bz2 tar.lz tar.gz tgz tar zip 7z"
146146

147147
# Default prefix for packages (may be overridden)
148148
PREFIX=/opt/ooce
@@ -232,6 +232,7 @@ GIT=$USRBIN/git
232232
LZIP=$USRBIN/lzip
233233
NAWK=$USRBIN/awk
234234
RSYNC=$USRBIN/rsync
235+
SEVENZ=$USRBIN/7zz
235236
UNZIP=$USRBIN/unzip
236237
WGET=$USRBIN/wget
237238
XZCAT=$USRBIN/xzcat

lib/functions.sh

+1
Original file line numberDiff line numberDiff line change
@@ -1559,6 +1559,7 @@ extract_archive() {
15591559
*.tar.bz2) $BUNZIP2 -dc $file | $TAR -xvf - $* ;;
15601560
*.tar.lz) $LZIP -dc $file | $TAR -xvf - $* ;;
15611561
*.tar.gz|*.tgz) $GZIP -dc $file | $TAR -xvf - $* ;;
1562+
*.7z) $SEVENZ x $file $* ;;
15621563
*.zip) $UNZIP $file $* ;;
15631564
*.tar) $TAR -xvf $file $* ;;
15641565
# May as well try tar. It's GNU tar which does a fair job at detecting

0 commit comments

Comments
 (0)