jlarson/snap
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

The following changes were made

Browse Source 
* Updated Makefile to get version from Snap.pm
  * Updated virtfs() in Snap.pm to properly check for dir with -d
This commit is contained in:
Jay Larson
2017-05-31 10:54:33 -05:00
parent d306fe03ae
commit bfa1d110c4
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@@ -12,11 +12,13 @@ DEPENDS = binutils,coreutils,gzip,perl>=5.20.0,tar
ARCH = x86_64 ARCH = x86_64
URL = URL =
DESC = The Snaplinux package management system DESC = The Snaplinux package management system
SNAPVER = 0
ARCHIVE := '' ARCHIVE := ''
SRCDIR := $(PWD)/SRC/snap SRCDIR := $(PWD)/SRC/snap
PATCHDIR := $(PWD)/SRC/patches 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 include /usr/share/snap/Makefile.snaplinux

4
SRC/snap/Snap.pm
View File

@@ -89,7 +89,7 @@ use constant VERFILE => eval {
} }
}; };
use constant { use constant {
VERSION => '0.7', VERSION => '0.8',
SNAPDIR => TARGET . '/var/lib/snap', SNAPDIR => TARGET . '/var/lib/snap',
PKGDIR => TARGET . '/var/lib/snap/packages', PKGDIR => TARGET . '/var/lib/snap/packages',
INSTDIR => TARGET . '/var/lib/snap/installed', INSTDIR => TARGET . '/var/lib/snap/installed',
@@ -832,7 +832,7 @@ sub virtfs {
my $stat = 0; my $stat = 0;
my $pid; my $pid;
if ( ! -f $virtfs->{$fs}{'dir'} ) { if ( ! -d $virtfs->{$fs}{'dir'} ) {
next; next;
} }