ports: update a lot of details

ports/.md5sum

@@ -1,4 +1,4 @@
-aec179b7027fcfc7229ee64c978c6243  core.rsync
-8b9958a0a2f54e7be6771fed5116f50e  opt.rsync
-e313376daf4b3ba7fa4145dba7adb700  ports
+9402d3e729f8bd6cbed27aea984fb108  core.rsync
+e357c661f3bb64e6540c4de449095537  opt.rsync
+c403aaa1bf79af1b9d481fcefa33214b  ports
 1f178e2bb1beab9782993931c9832280  ports-1.5.tar.gz

ports/Pkgfile

@@ -5,7 +5,7 @@
 
 name=ports
 version=1.5
-release=6
+release=7
 source="
     http://www.fukt.bth.se/~per/crux/files/ports/$name-$version.tar.gz
     ports

ports/core.rsync

@@ -1,3 +1,3 @@
 host=crux.nu
-collection=ports/crux-2.1/core/
+collection=ports/crux-2.2/core/
 destination=/usr/ports/core

ports/opt.rsync

@@ -1,3 +1,3 @@
 host=crux.nu
-collection=ports/crux-2.1/opt/
+collection=ports/crux-2.2/opt/
 destination=/usr/ports/opt

ports/ports

@@ -18,24 +18,28 @@
 #  along with this program; if not, write to the Free Software
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 #  USA.
-
 export PATH=/bin:/usr/bin
 
+if [ $(id -u) -eq 0 ]; then
+    echo "$COMMAND: root should not update ports"
+    exit 1
+fi
+
 check_ports_dir() {
     if [ ! -d "$PORTS_DIR" ]; then
-	echo "$COMMAND: directory '$PORTS_DIR' not found"
+	echo "$COMMAND: directory \`$PORTS_DIR' not found"
 	exit 1
     fi
 }
 
 update_ports() {
-    if [ $(id -u) -eq 0 ]; then
-	echo "$COMMAND: root should not update ports"
+    export PORTS_DIR
+
+    if ! stat -t /etc/ports/drivers/* >/dev/null 2>&1; then
+	echo "$COMMAND: no driver(s) installed" >&2
 	exit 1
     fi
 
-    export PORTS_DIR
-
     if [ "$OPT_COLLECTIONS" ]; then
 	# Update selected collections
 	for collection in $OPT_COLLECTIONS; do
@@ -56,7 +60,7 @@ update_ports() {
 		    fi
 		done
 	    else
-		echo "$COMMAND: collection '$collection' not found"
+		echo "$COMMAND: collection \`$collection' not found"
 	    fi
 	done
     else
@@ -69,10 +73,6 @@ update_ports() {
 		done
 	    fi
 	done
-
-	if [ ! "$driver" ]; then
-	    echo "$COMMAND: no driver(s) installed"
-	fi
     fi
     wait
     echo 'Ports update done.'
@@ -117,7 +117,7 @@ list_differences() {
 }
 
 print_try_help() {
-    echo "Try '$COMMAND --help' for more information."
+    echo "Try \`$COMMAND --help' for more information."
 }
 
 print_help() {
@@ -195,5 +195,3 @@ PORTS_DIR="/usr/ports"
 COMMAND=${0##*/}
 
 main "$@"
-
-# End of file