200bed5c06
```sh
git grep -l '^patch_args=-Np0' "srcpkgs/$1*/template" |
while read template; do
for p in ${template%/template}/patches/*; do
sed -i '
\,^[+-][+-][+-] /dev/null,b
/^[*-]\+ [0-9]\+\(,[0-9]\+\)\? [*-]\+$/b
s,^[*][*][*] ,&a/,
/^--- /{
s,\(^--- \)\(./\)*,\1a/,
s,[.][Oo][Rr][Ii][Gg]\([ /]\),\1,
s/[.][Oo][Rr][Ii][Gg]$//
s/[.]patched[.]\([^.]\)/.\1/
h
}
/^+++ -/{
g
s/^--- a/+++ b/
b
}
s,\(^+++ \)\(./\)*,\1b/,
' "$p"
done
sed -i '/^patch_args=/d' $template
done
```
42 lines
1.5 KiB
Diff
42 lines
1.5 KiB
Diff
From c0495ce121ab0c3eeffdf08614e18bd4f0c455f2 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Gauduin <alucryd@archlinux.org>
|
|
Date: Wed, 18 Mar 2020 12:19:31 +0100
|
|
Subject: [PATCH] use more sensible paths
|
|
|
|
---
|
|
higan/target-higan/higan.cpp | 5 ++---
|
|
icarus/icarus.cpp | 3 +--
|
|
2 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git higan/target-higan/higan.cpp higan/target-higan/higan.cpp
|
|
index 1ce9b991..7d1ae122 100644
|
|
--- a/higan/target-higan/higan.cpp
|
|
+++ b/higan/target-higan/higan.cpp
|
|
@@ -43,11 +43,10 @@ auto nall::main(Arguments arguments) -> void {
|
|
Path::data = document["data"].text();
|
|
}
|
|
if(!directory::exists(Path::templates)) {
|
|
- Path::templates = {Path::userData(), "higan/"};
|
|
- directory::create(Path::templates);
|
|
+ Path::templates = {Path::sharedData(), "higan/Templates/"};
|
|
}
|
|
if(!directory::exists(Path::data)) {
|
|
- Path::data = {Path::user(), "higan/"};
|
|
+ Path::data = {Path::userData(), "higan/Systems/"};
|
|
directory::create(Path::data);
|
|
}
|
|
file::write({Path::settings, "paths.bml"}, string{
|
|
diff --git a/icarus/icarus.cpp b/icarus/icarus.cpp
|
|
index 95435f38..a46744e5 100644
|
|
--- a/icarus/icarus.cpp
|
|
+++ b/icarus/icarus.cpp
|
|
@@ -8,8 +8,7 @@ auto locate(string name) -> string {
|
|
string location = {Path::program(), name};
|
|
if(inode::exists(location)) return location;
|
|
|
|
- directory::create({Path::userData(), "icarus/"});
|
|
- return {Path::userData(), "icarus/", name};
|
|
+ return {Path::sharedData(), "icarus/", name};
|
|
}
|
|
|
|
auto operator+=(string& lhs, const string& rhs) -> string& {
|