From beac21f5ad2d9cab9d1f853fa0b6c55e855b28ff Mon Sep 17 00:00:00 2001 From: tokiclover Date: Thu, 28 May 2015 11:51:58 +0200 Subject: [PATCH] browser-home-profile: mktmp: Added busybox/mktemp support (0.8 version bump) --- modules/browser-home-profile/functions/mktmp | 32 ++++++++++++-------- 1 file changed, 20 insertions(+), 12 deletions(-) mode change 100644 => 100755 modules/browser-home-profile/functions/mktmp diff --git a/modules/browser-home-profile/functions/mktmp b/modules/browser-home-profile/functions/mktmp old mode 100644 new mode 100755 index ec0c8593..2a1b60f7 --- a/modules/browser-home-profile/functions/mktmp +++ b/modules/browser-home-profile/functions/mktmp @@ -1,8 +1,9 @@ +#!/bin/zsh # # $Header: browser-home-profile/functions/mktmp Exp $ # $Aythor: (c) 2012-015 -tclover Exp $ # $License: MIT (or 2-clause/new/simplified BSD) Exp $ -# $Version: 0.7 2015/05/14 21:09:26 Exp $ +# $Version: 0.8 2015/05/24 21:09:26 Exp $ # function mktmp { @@ -14,7 +15,7 @@ function mktmp { -o, --owner Use owner name -g, --group Use group name -m, --mode 1700 Use octal mode - -p, --tmpdir[=DIR] Enable mktmp mode + -p, --tmpdir=DIR Use temp-dir -h, --help Help/Exit EOH } @@ -26,8 +27,8 @@ function mktmp { local ARGS name=mktmp ARGS="$(getopt \ - -o dfg:hm:o:p:: \ - -l dir,file,group:,tmpdir:: -l help,mode:owner: \ + -o dfg:hm:o:p: \ + -l dir,file,group:,tmpdir:,help,mode:owner: \ -s sh -n mktmp -- "${@}")" if (( ${?} != 0 )) { mktmp-help; return 2; } eval set -- ${ARGS} @@ -56,13 +57,19 @@ function mktmp { (*${temp}) ;; (*) pr-error "Invalid TEMPLATE"; return 4;; } - - if (( ${+commands[mktemp]} )); then - tmp="$(mktemp ${tmpdir:+-p} ${tmpdir} ${ARGS} ${1})" - else + local mktmp + if (( ${+commands[mktemp]} )) { + mktmp=mktemp + } elif (( ${+commands[busybox]} )) { + mktmp='busybox mktemp' + } + if (( ${+mktmp} )) { + tmp=$(${mktmp} ${tmpdir:+-p} ${tmpdir} ${ARGS} ${1}) + } + if [[ ! -e ${tmp} ]] { (( ${+commands[uuidgen]} )) && temp=$(uuidgen --random) tmp="${tmpdir}/${1%-*}-${temp:1:6}" - fi + } case ${type} { (dir) [[ -d ${tmp} ]] || mkdir -p ${tmp};; (*) [[ -e ${tmp} ]] || { mkdir -p ${tmp:h}; touch ${tmp}; };; @@ -72,9 +79,10 @@ function mktmp { return 5 } [[ -h ${tmp} ]] && return - (( -n ${owner} )) && chown ${owner} ${tmp} - (( -n ${group} )) && chgrp ${group} ${tmp} - (( -n ${mode} )) && chmod ${mode} ${tmp} + [[ -n ${owner} ]] && chown ${owner} ${tmp} + [[ -n ${group} ]] && chgrp ${group} ${tmp} + [[ -n ${mode} ]] && chmod ${mode} ${tmp} + print ${tmp} } case ${(%):-%1x} {