From 728e157551f4baca737e6a13dce3258228081cb3 Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Wed, 4 Apr 2018 11:09:17 -0500 Subject: [PATCH] The following changes were made: * Added REPO, and BRIEF to Makefile * usher now uses /bin/sh * Removed TARGET from usher --- Makefile | 8 ++++++-- SNAP/usher | 6 +++--- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2af2e3d..40a03bc 100644 --- a/Makefile +++ b/Makefile @@ -11,8 +11,12 @@ DEPENDS = glibc,grep,libzfs,util-linux,xz,zlib ARCH = x86_64 URL = http://www.gnu.org/software/grub/ -DESC = GNU GRUB is a Multiboot boot loader. -SNAPVER = 7 +REPO = core +BRIEF = GNU GRUB is a Multiboot boot loader. +DESC = GNU GRUB is a very powerful boot loader, which can load a wide variety \ +of free operating systems, as well as proprietary operating systems with \ +chain-loading +SNAPVER = 8 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') diff --git a/SNAP/usher b/SNAP/usher index 7b99caf..e0ebfb0 100755 --- a/SNAP/usher +++ b/SNAP/usher @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh set -e @@ -7,8 +7,8 @@ case $1 in exit 0 ;; postinst) - if [ ! -f ${TARGET}/etc/default/grub ]; then - cp ${TARGET}/usr/share/grub/grub.default ${TARGET}/etc/default/grub + if [ ! -f /etc/default/grub ]; then + cp /usr/share/grub/grub.default /etc/default/grub fi ;; prerm)