From bfa1d110c44bb0acf214fce846988f7def1482d4 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Wed, 31 May 2017 10:54:33 -0500 Subject: [PATCH] The following changes were made * Updated Makefile to get version from Snap.pm * Updated virtfs() in Snap.pm to properly check for dir with -d --- Makefile | 4 +++- SRC/snap/Snap.pm | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index d195095..f91f00a 100644 --- a/Makefile +++ b/Makefile @@ -12,11 +12,13 @@ DEPENDS = binutils,coreutils,gzip,perl>=5.20.0,tar ARCH = x86_64 URL = DESC = The Snaplinux package management system +SNAPVER = 0 ARCHIVE := '' SRCDIR := $(PWD)/SRC/snap PATCHDIR := $(PWD)/SRC/patches -VERSION := 0.7-0 +VERSION := $(shell grep 'VERSION =>' SRC/snap/Snap.pm| \ + sed "s/.*=> '\|',//g")-$(SNAPVER) include /usr/share/snap/Makefile.snaplinux diff --git a/SRC/snap/Snap.pm b/SRC/snap/Snap.pm index 95936de..f251f12 100644 --- a/SRC/snap/Snap.pm +++ b/SRC/snap/Snap.pm @@ -89,7 +89,7 @@ use constant VERFILE => eval { } }; use constant { - VERSION => '0.7', + VERSION => '0.8', SNAPDIR => TARGET . '/var/lib/snap', PKGDIR => TARGET . '/var/lib/snap/packages', INSTDIR => TARGET . '/var/lib/snap/installed', @@ -832,7 +832,7 @@ sub virtfs { my $stat = 0; my $pid; - if ( ! -f $virtfs->{$fs}{'dir'} ) { + if ( ! -d $virtfs->{$fs}{'dir'} ) { next; }