From 55852fa53a24eab73e875fb50cd4a83c0e68aeb2 Mon Sep 17 00:00:00 2001
From: stanley lieber <stanley.lieber@gmail.com>
Date: Sun, 15 May 2011 05:24:08 +0000
Subject: [PATCH] pkg: support installing from local directories as well as
 remote URLs; PKG_PATH -> pkgpath

---
 sys/src/cmd/pkg/install | 10 +++++++---
 sys/src/cmd/pkg/list    |  9 ++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/sys/src/cmd/pkg/install b/sys/src/cmd/pkg/install
index 7c1baf223..fe9a18949 100755
--- a/sys/src/cmd/pkg/install
+++ b/sys/src/cmd/pkg/install
@@ -1,7 +1,7 @@
 #!/bin/rc -e
 
-if(~ $#PKG_PATH 0)
-	PKG_PATH=http://pkg.violetti.org
+if(~ $#pkgpath 0)
+	pkgpath=http://pkg.violetti.org/$cputype
 
 cd /
 mkdir -p /sys/lib/pkg
@@ -10,6 +10,10 @@ if (test -s /sys/lib/pkg/$1) {
 	exit
 }
 echo Installing $1
-hget $PKG_PATH/$cputype/$1.tbz | bunzip2 | pkg/unpkg>[2]/sys/lib/pkg/$1
+if(~ $pkgpath ftp* http*)
+	cmd=hget
+if not
+	cmd=cat
+$cmd $pkgpath/$1.tbz | bunzip2 | pkg/unpkg>[2]/sys/lib/pkg/$1
 echo Done
 
diff --git a/sys/src/cmd/pkg/list b/sys/src/cmd/pkg/list
index 9a38d7fa3..f35036860 100755
--- a/sys/src/cmd/pkg/list
+++ b/sys/src/cmd/pkg/list
@@ -1,6 +1,9 @@
 #!/bin/rc
 
-if(~ $#PKG_PATH 0)
-	PKG_PATH=http://pkg.violetti.org
+if(~ $#pkgpath 0)
+	pkgpath=http://pkg.violetti.org/$cputype
 
-hget $PKG_PATH/$cputype | htmlfmt | grep '\.tbz' | sed -e 's/\.tbz$//'
+if(~ $pkgpath ftp* http*)
+	hget $pkgpath | htmlfmt | grep '\.tbz' | sed -e 's/\.tbz$//'
+if not
+	ls -p $pkgpath