diff --git a/recipes/wip/dev/lang/kotlin/recipe.toml b/recipes/wip/dev/lang/kotlin/recipe.toml index e8e991690..b908c1732 100644 --- a/recipes/wip/dev/lang/kotlin/recipe.toml +++ b/recipes/wip/dev/lang/kotlin/recipe.toml @@ -3,9 +3,9 @@ template = "custom" script = """ mkdir -pv "${COOKBOOK_STAGE}/usr/bin/kotlin-dir" -wget https://github.com/JetBrains/kotlin/releases/download/v2.3.0/kotlin-compiler-2.3.0.zip -unzip kotlin-compiler-2.3.0.zip -d "${COOKBOOK_BUILD}" -mv "${COOKBOOK_BUILD}/kotlin/*" "${COOKBOOK_STAGE}/usr/bin/kotlin-dir" +wget https://github.com/JetBrains/kotlin/releases/download/v2.3.0/kotlin-compiler-2.3.0.zip "${COOKBOOK_BUILD}" +unzip "${COOKBOOK_BUILD}"/kotlin-compiler-2.3.0.zip -d "${COOKBOOK_BUILD}" +mv "${COOKBOOK_BUILD}"/kotlinc/* "${COOKBOOK_STAGE}/usr/bin/kotlin-dir" echo "/usr/bin/kotlin-dir/bin/kotlinc" > "${COOKBOOK_STAGE}"/usr/bin/kotlinc chmod a+x "${COOKBOOK_STAGE}"/usr/bin/kotlinc """ diff --git a/recipes/wip/fonts/nerd-fonts/recipe.toml b/recipes/wip/fonts/nerd-fonts/recipe.toml index 7c0e45c44..d61c59073 100644 --- a/recipes/wip/fonts/nerd-fonts/recipe.toml +++ b/recipes/wip/fonts/nerd-fonts/recipe.toml @@ -1,10 +1,11 @@ -#TODO probably wrong script +#TODO not tested [source] git = "https://github.com/ryanoasis/nerd-fonts" -rev = "7b41c66a1ef0c4ac5884a4203cb53c0901217e32" +rev = "v3.4.0" +shallow_clone = true [build] template = "custom" script = """ -mkdir -pv "${COOKBOOK_STAGE}"/usr/share/fonts -cp -rv "${COOKBOOK_SOURCE}"/patched-fonts/* "${COOKBOOK_STAGE}"/usr/share/fonts +mkdir -pv "${COOKBOOK_STAGE}"/usr/share/fonts/Nerd +cp -rv "${COOKBOOK_SOURCE}"/patched-fonts/* "${COOKBOOK_STAGE}"/usr/share/fonts/Nerd """ diff --git a/recipes/wip/fonts/noto-sans-cjk/recipe.toml b/recipes/wip/fonts/noto-sans-cjk/recipe.toml index 2b1408d35..d780a22f6 100644 --- a/recipes/wip/fonts/noto-sans-cjk/recipe.toml +++ b/recipes/wip/fonts/noto-sans-cjk/recipe.toml @@ -1,9 +1,8 @@ [build] template = "custom" script = """ -mkdir -pv fonts "${COOKBOOK_STAGE}/usr/share/fonts/Noto-Sans-CJK" +mkdir -pv "${COOKBOOK_BUILD}"/fonts "${COOKBOOK_STAGE}/usr/share/fonts/Noto-Sans-CJK" wget https://github.com/notofonts/noto-cjk/releases/download/Sans2.004/02_NotoSansCJK-TTF-VF.zip -unzip 02_NotoSansCJK-TTF-VF.zip -d fonts -mkdir -pv "${COOKBOOK_STAGE}/usr/share/fonts/Noto-Sans-CJK" -cp -rv fonts/Variable/TTF/* "${COOKBOOK_STAGE}/usr/share/fonts/Noto-Sans-CJK" +unzip "${COOKBOOK_BUILD}"/02_NotoSansCJK-TTF-VF.zip -d "${COOKBOOK_BUILD}"/fonts +cp -rv "${COOKBOOK_BUILD}"/fonts/Variable/TTF/* "${COOKBOOK_STAGE}/usr/share/fonts/Noto-Sans-CJK" """ diff --git a/recipes/wip/fonts/noto-serif-cjk/recipe.toml b/recipes/wip/fonts/noto-serif-cjk/recipe.toml index 5c644fd54..c9e5a13f7 100644 --- a/recipes/wip/fonts/noto-serif-cjk/recipe.toml +++ b/recipes/wip/fonts/noto-serif-cjk/recipe.toml @@ -1,8 +1,8 @@ [build] template = "custom" script = """ -mkdir -pv fonts "${COOKBOOK_STAGE}/usr/share/fonts/Noto-Serif-CJK" +mkdir -pv "${COOKBOOK_BUILD}"/fonts "${COOKBOOK_STAGE}/usr/share/fonts/Noto-Serif-CJK" wget https://github.com/notofonts/noto-cjk/releases/download/Serif2.003/03_NotoSerifCJK-TTF-VF.zip -unzip 03_NotoSerifCJK-TTF-VF.zip -d fonts -cp -rv fonts/Variable/TTF/* "${COOKBOOK_STAGE}/usr/share/fonts/Noto-Serif-CJK" +unzip "${COOKBOOK_BUILD}"/03_NotoSerifCJK-TTF-VF.zip -d "${COOKBOOK_BUILD}"/fonts +cp -rv "${COOKBOOK_BUILD}"/fonts/Variable/TTF/* "${COOKBOOK_STAGE}/usr/share/fonts/Noto-Serif-CJK" """ diff --git a/recipes/wip/fonts/noto/recipe.toml b/recipes/wip/fonts/noto/recipe.toml index 40e88c1c5..c33429709 100644 --- a/recipes/wip/fonts/noto/recipe.toml +++ b/recipes/wip/fonts/noto/recipe.toml @@ -5,6 +5,8 @@ shallow_clone = true [build] template = "custom" script = """ -mkdir -pv "${COOKBOOK_STAGE}/usr/share/fonts/Noto" -cp -rv "${COOKBOOK_SOURCE}"/fonts/*/full/ttf/* "${COOKBOOK_STAGE}/usr/share/fonts/Noto" +mkdir -pv "${COOKBOOK_STAGE}"/usr/share/fonts/Noto +for f in "${COOKBOOK_SOURCE}"/fonts/*; do +echo cp -rv "${f}/full/ttf/* "${COOKBOOK_STAGE}/usr/share/fonts/Noto/$(basename ${f})/" +done """