diff options
| -rwxr-xr-x | configure | 21 | ||||
| -rwxr-xr-x | core/src/demo/xmake.sh | 13 |
2 files changed, 5 insertions, 29 deletions
@@ -280,23 +280,9 @@ path_directory() { if test_z "${path}"; then raise "invalid empty path in path_directory()." fi - local oldifs="${IFS}" - IFS='/' - set -- ${path} - local dir="" - local first=true - local startswith_sep=false - while test $# != 1; do - local item="${1}" - if test_nz "${item}"; then - dir="${dir}/${item}" - elif $first; then - startswith_sep=true - fi - first=false - shift - done - if $startswith_sep; then + path="${path%/}" + local dir="${path%/*}" + if string_startswith "${path}" "/"; then if test_z "${dir}"; then dir="/" fi @@ -307,7 +293,6 @@ path_directory() { fi fi _ret="${dir}" - IFS="${oldifs}" } # e.g. path_filename_fromdir "/tmp/file" "/tmp" -> "file" diff --git a/core/src/demo/xmake.sh b/core/src/demo/xmake.sh index e0a753639..36d40ffb7 100755 --- a/core/src/demo/xmake.sh +++ b/core/src/demo/xmake.sh @@ -24,17 +24,8 @@ target "demo" # add install files add_installfiles "${projectdir}/(xmake/**.lua)" "share" - add_installfiles "${projectdir}/(xmake/scripts/**.sh)" "share" - add_installfiles "${projectdir}/(xmake/scripts/**.cmake)" "share" - add_installfiles "${projectdir}/(xmake/scripts/**.pl)" "share" - add_installfiles "${projectdir}/(xmake/scripts/**.cpp)" "share" - add_installfiles "${projectdir}/(xmake/scripts/gitignore)" "share" - add_installfiles "${projectdir}/(xmake/scripts/PkgInfo)" "share" - add_installfiles "${projectdir}/(xmake/templates/**.c)" "share" - add_installfiles "${projectdir}/(xmake/templates/**.cpp)" "share" - add_installfiles "${projectdir}/(xmake/templates/**.m)" "share" - add_installfiles "${projectdir}/(xmake/templates/**.mm)" "share" - add_installfiles "${projectdir}/(xmake/templates/**.h)" "share" + add_installfiles "${projectdir}/(xmake/scripts/**)" "share" + add_installfiles "${projectdir}/(xmake/templates/**)" "share" add_installfiles "${projectdir}/scripts/xrepo.sh" "bin" "xrepo" # add syslinks |