From owner-svn-ports-head@freebsd.org  Thu Oct  1 18:32:30 2020
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 45C4943071C;
 Thu,  1 Oct 2020 18:32:30 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4C2MDZ01JKz4WTv;
 Thu,  1 Oct 2020 18:32:30 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D80CB15685;
 Thu,  1 Oct 2020 18:32:29 +0000 (UTC)
 (envelope-from manu@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 091IWTYF005520;
 Thu, 1 Oct 2020 18:32:29 GMT (envelope-from manu@FreeBSD.org)
Received: (from manu@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 091IWTVW005518;
 Thu, 1 Oct 2020 18:32:29 GMT (envelope-from manu@FreeBSD.org)
Message-Id: <202010011832.091IWTVW005518@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: manu set sender to
 manu@FreeBSD.org using -f
From: Emmanuel Vadot <manu@FreeBSD.org>
Date: Thu, 1 Oct 2020 18:32:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r550860 - head/Keywords
X-SVN-Group: ports-head
X-SVN-Commit-Author: manu
X-SVN-Commit-Paths: head/Keywords
X-SVN-Commit-Revision: 550860
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.33
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Oct 2020 18:32:30 -0000

Author: manu
Date: Thu Oct  1 18:32:29 2020
New Revision: 550860
URL: https://svnweb.freebsd.org/changeset/ports/550860

Log:
  Lua version of the @sample
  
  The bonus of this version being: sandboxed
  Natively rootdir compliant.
  
  Reviewed by:	portmgr (bapt@, mat@)
  Differential Revision:	https://reviews.freebsd.org/D23617

Modified:
  head/Keywords/sample.ucl

Modified: head/Keywords/sample.ucl
==============================================================================
--- head/Keywords/sample.ucl	Thu Oct  1 18:32:04 2020	(r550859)
+++ head/Keywords/sample.ucl	Thu Oct  1 18:32:29 2020	(r550860)
@@ -20,42 +20,28 @@
 
 actions: [file(1)]
 arguments: true
-post-install: <<EOD
-  case "%1" in
-  /*) sample_file="%1" ;;
-  *) sample_file="%D/%1" ;;
-  esac
-  target_file="${sample_file%.sample}"
-  set -- %@
-  if [ $# -eq 2 ]; then
-      target_file=${2}
-  fi
-  case "${target_file}" in
-  /*) target_file="${target_file}" ;;
-  *) target_file="%D/${target_file}" ;;
-  esac
-  if ! [ -f "${target_file}" ]; then
-    /bin/cp -p "${sample_file}" "${target_file}"
-  fi
-EOD
-pre-deinstall: <<EOD
-  case "%1" in
-  /*) sample_file="%1" ;;
-  *) sample_file="%D/%1" ;;
-  esac
-  target_file="${sample_file%.sample}"
-  set -- %@
-  if [ $# -eq 2 ]; then
-      set -- %@
-      target_file=${2}
-  fi
-  case "${target_file}" in
-  /*) target_file="${target_file}" ;;
-  *) target_file="%D/${target_file}" ;;
-  esac
-  if cmp -s "${target_file}" "${sample_file}"; then
-    rm -f "${target_file}"
-  elif [ -e "${target_file}" ] ; then
-    echo "You may need to manually remove ${target_file} if it is no longer needed."
-  fi
-EOD
+post-install-lua: <<EOS
+  sample_file = pkg.prefixed_path("%1")
+  if "%#" == 2 then
+    target_file = pkg.prefixed_path("%1")
+  else
+    target_file = string.gsub(sample_file,'%.sample$', "")
+  end
+  if not pkg.stat(target_file) then
+    pkg.copy(sample_file, target_file)
+  end
+EOS
+
+pre-deinstall-lua: <<EOS
+  sample_file = pkg.prefixed_path("%1")
+  if "%#" == 2 then
+    target_file = pkg.prefixed_path("%1")
+  else
+    target_file = string.gsub(sample_file,'%.sample$', "")
+  end
+  if pkg.filecmp(sample_file, target_file) == 0 then
+    os.remove(target_file)
+  else
+    pkg.print_msg("You may need to manually remove " .. target_file .. " if it is no longer needed.")
+  end
+EOS