diff --git a/Base/res/devel/templates/cpp-basic.ini b/Base/usr/share/HackStudio/templates/cpp-basic.ini similarity index 100% rename from Base/res/devel/templates/cpp-basic.ini rename to Base/usr/share/HackStudio/templates/cpp-basic.ini diff --git a/Base/res/devel/templates/cpp-basic.postcreate b/Base/usr/share/HackStudio/templates/cpp-basic.postcreate similarity index 100% rename from Base/res/devel/templates/cpp-basic.postcreate rename to Base/usr/share/HackStudio/templates/cpp-basic.postcreate diff --git a/Base/res/devel/templates/cpp-basic/main.cpp b/Base/usr/share/HackStudio/templates/cpp-basic/main.cpp similarity index 100% rename from Base/res/devel/templates/cpp-basic/main.cpp rename to Base/usr/share/HackStudio/templates/cpp-basic/main.cpp diff --git a/Base/res/devel/templates/cpp-library.ini b/Base/usr/share/HackStudio/templates/cpp-library.ini similarity index 100% rename from Base/res/devel/templates/cpp-library.ini rename to Base/usr/share/HackStudio/templates/cpp-library.ini diff --git a/Base/res/devel/templates/cpp-library.postcreate b/Base/usr/share/HackStudio/templates/cpp-library.postcreate similarity index 100% rename from Base/res/devel/templates/cpp-library.postcreate rename to Base/usr/share/HackStudio/templates/cpp-library.postcreate diff --git a/Base/res/devel/templates/cpp-library/Class1.cpp b/Base/usr/share/HackStudio/templates/cpp-library/Class1.cpp similarity index 100% rename from Base/res/devel/templates/cpp-library/Class1.cpp rename to Base/usr/share/HackStudio/templates/cpp-library/Class1.cpp diff --git a/Base/res/devel/templates/cpp-library/Class1.h b/Base/usr/share/HackStudio/templates/cpp-library/Class1.h similarity index 100% rename from Base/res/devel/templates/cpp-library/Class1.h rename to Base/usr/share/HackStudio/templates/cpp-library/Class1.h diff --git a/Base/res/devel/templates/empty.ini b/Base/usr/share/HackStudio/templates/empty.ini similarity index 100% rename from Base/res/devel/templates/empty.ini rename to Base/usr/share/HackStudio/templates/empty.ini diff --git a/Base/res/devel/templates/serenity-application.ini b/Base/usr/share/HackStudio/templates/serenity-application.ini similarity index 100% rename from Base/res/devel/templates/serenity-application.ini rename to Base/usr/share/HackStudio/templates/serenity-application.ini diff --git a/Base/res/devel/templates/serenity-application.postcreate b/Base/usr/share/HackStudio/templates/serenity-application.postcreate similarity index 100% rename from Base/res/devel/templates/serenity-application.postcreate rename to Base/usr/share/HackStudio/templates/serenity-application.postcreate diff --git a/Base/res/devel/templates/serenity-application/main.cpp b/Base/usr/share/HackStudio/templates/serenity-application/main.cpp similarity index 100% rename from Base/res/devel/templates/serenity-application/main.cpp rename to Base/usr/share/HackStudio/templates/serenity-application/main.cpp diff --git a/Meta/build-root-filesystem.sh b/Meta/build-root-filesystem.sh index a89c0711d8c..bc33c24b8f6 100755 --- a/Meta/build-root-filesystem.sh +++ b/Meta/build-root-filesystem.sh @@ -135,7 +135,7 @@ if [ -f mnt/bin/network-settings ]; then fi chmod 600 mnt/etc/shadow -chmod 755 mnt/res/devel/templates/*.postcreate +chmod 755 mnt/usr/share/HackStudio/templates/*.postcreate echo "done" printf "creating initial filesystem structure... " diff --git a/Meta/new-project.sh b/Meta/new-project.sh index be60745732c..40c510559cd 100755 --- a/Meta/new-project.sh +++ b/Meta/new-project.sh @@ -9,7 +9,7 @@ script_name="$(basename "$0")" function list_templates() { echo "Available templates:" - for file in ./Base/res/devel/templates/*.ini; do + for file in ./Base/usr/share/HackStudio/templates/*.ini; do printf ' %s - ' "$(basename "${file%%.ini}")" awk -F "=" '/Description/ { print $2 }' "$file" done @@ -48,9 +48,9 @@ done TEMPLATE="$1" DESTINATION="$2" -TEMPLATE_SOURCE_DIRECTORY="./Base/res/devel/templates/$TEMPLATE" -TEMPLATE_INI="./Base/res/devel/templates/$TEMPLATE.ini" -TEMPLATE_POSTCREATE="./Base/res/devel/templates/$TEMPLATE.postcreate" +TEMPLATE_SOURCE_DIRECTORY="./Base/usr/share/HackStudio/templates/$TEMPLATE" +TEMPLATE_INI="./Base/usr/share/HackStudio/templates/$TEMPLATE.ini" +TEMPLATE_POSTCREATE="./Base/usr/share/HackStudio/templates/$TEMPLATE.postcreate" if [[ ! -f "$TEMPLATE_INI" ]]; then echo "$script_name: unknown template \"$TEMPLATE\"." diff --git a/Userland/DevTools/HackStudio/ProjectTemplate.h b/Userland/DevTools/HackStudio/ProjectTemplate.h index 9e5f0750ac0..5c7738cfc26 100644 --- a/Userland/DevTools/HackStudio/ProjectTemplate.h +++ b/Userland/DevTools/HackStudio/ProjectTemplate.h @@ -17,7 +17,7 @@ namespace HackStudio { class ProjectTemplate : public RefCounted { public: - static ByteString templates_path() { return "/res/devel/templates"; } + static ByteString templates_path() { return "/usr/share/HackStudio/templates"; } static RefPtr load_from_manifest(ByteString const& manifest_path);