[Midnightbsd-cvs] src [9850] U trunk/sys/boot/forth: update version.4th

[laffer1 at midnightbsd.org]

Revision: 9850
          http://svnweb.midnightbsd.org/src/?rev=9850
Author:   laffer1
Date:     2018-05-22 22:58:27 -0400 (Tue, 22 May 2018)
Log Message:
-----------
update version.4th

Modified Paths:
--------------
    trunk/sys/boot/forth/version.4th
    trunk/sys/boot/forth/version.4th.8

Property Changed:
----------------
    trunk/sys/boot/forth/version.4th
    trunk/sys/boot/forth/version.4th.8

Modified: trunk/sys/boot/forth/version.4th
===================================================================
--- trunk/sys/boot/forth/version.4th	2018-05-23 02:51:21 UTC (rev 9849)
+++ trunk/sys/boot/forth/version.4th	2018-05-23 02:58:27 UTC (rev 9850)
@@ -1,4 +1,4 @@
-\ Copyright (c) 2006-2011 Devin Teske <devinteske at hotmail.com>
+\ Copyright (c) 2006-2013 Devin Teske <dteske at FreeBSD.org>
 \ All rights reserved.
 \ 
 \ Redistribution and use in source and binary forms, with or without
@@ -29,6 +29,9 @@
 variable versionX
 variable versionY
 
+\ Default $loader_version value if not overridden or using tribute screen
+: str_loader_version ( -- C-ADDR/U|-1 ) s" " ;
+
 \ Initialize text placement to defaults
 80 versionX !	\ NOTE: this is the ending column (text is right-justified)
 24 versionY !
@@ -43,9 +46,33 @@
 		?number drop versionY ! -1
 	then drop
 
-	\ Exit if a version was not set
+	\ Default version if none was set
 	s" loader_version" getenv dup -1 = if
-		drop exit
+		drop
+		\ Default version if no logo is requested
+		s" loader_logo" getenv dup -1 = if
+			drop str_loader_version
+		else
+			2dup s" tribute" compare-insensitive 0= if
+				2drop
+				s" tribute-logo" sfind if
+					drop exit \ see beastie tribute-text
+				else
+					drop str_loader_version
+				then
+			else 2dup s" tributebw" compare-insensitive 0= if
+				2drop
+				s" tributebw-logo" sfind if
+					drop exit \ see beastie tribute-text
+				else
+					drop str_loader_version
+				then
+			else
+				2drop str_loader_version
+			then then
+		then
+	then dup -1 = if
+		drop exit \ default version (above) is disabled
 	then
 
 	\ Right justify the text


Property changes on: trunk/sys/boot/forth/version.4th
___________________________________________________________________
Added: mnbsd:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/sys/boot/forth/version.4th.8
===================================================================
--- trunk/sys/boot/forth/version.4th.8	2018-05-23 02:51:21 UTC (rev 9849)
+++ trunk/sys/boot/forth/version.4th.8	2018-05-23 02:58:27 UTC (rev 9850)
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2011 Devin Teske
+.\" Copyright (c) 2011-2013 Devin Teske
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -22,9 +22,10 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\" $MidnightBSD: src/sys/boot/forth/version.4th.8,v 1.2 2012/12/29 04:58:55 laffer1 Exp $
+.\" $FreeBSD: stable/9/sys/boot/forth/version.4th.8 254953 2013-08-27 06:31:50Z dteske $
+.\" $MidnightBSD$
 .\"
-.Dd May 19, 2011
+.Dd August 6, 2013
 .Dt VERSION.4TH 8
 .Os
 .Sh NAME
@@ -84,13 +85,14 @@
 Default is 24.
 .It Va loader_color
 If set to
-.Dq Li YES
+.Dq Li NO
 (case-insensitive) or
-.Dq Li 1 ,
-causes the version to be printed in ANSI Cyan.
+.Dq Li 0 ,
+causes the version to be printed without color
+.Pq default is ANSI Cyan .
 .El
 .Sh FILES
-.Bl -tag -width /boot/loader.4th -compact
+.Bl -tag -width /boot/version.4th -compact
 .It Pa /boot/loader
 The
 .Xr loader 8 .
@@ -113,6 +115,7 @@
 .Sh SEE ALSO
 .Xr loader.conf 5 ,
 .Xr loader 8 ,
+.Xr color.4th 8
 .Sh HISTORY
 The
 .Nm
@@ -123,4 +126,4 @@
 .Nm
 set of commands was written by
 .An -nosplit
-.An Devin Teske Aq devinteske at hotmail.com .
+.An Devin Teske Aq dteske at FreeBSD.org .


Property changes on: trunk/sys/boot/forth/version.4th.8
___________________________________________________________________
Added: mnbsd:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property