diff --git a/build.sh b/bin/build.sh similarity index 100% rename from build.sh rename to bin/build.sh diff --git a/makepkg.sh b/bin/makepkg.sh similarity index 81% rename from makepkg.sh rename to bin/makepkg.sh index fb602c0..7df1ee8 100755 --- a/makepkg.sh +++ b/bin/makepkg.sh @@ -83,10 +83,10 @@ fehooksdir=${fedir}/src/hooks makefe() { cd ${fedir} - git checkout ${feassetsdir} - git checkout ${felocalesdir} - git checkout ${feconstantsdir} - git checkout ${fehooksdir} + # git checkout ${feassetsdir} + # git checkout ${felocalesdir} + # git checkout ${feconstantsdir} + # git checkout ${fehooksdir} git pull if [ "${pkgtype}" == "badeb" ]; then cp -rf ${customizeddir}/images/* ${feassetsdir} @@ -94,16 +94,17 @@ makefe() { find "${feconstantsdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥()“”,。?!]~·]//g' {} + find "${fehooksdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥()“”,。?!]~·]//g' {} + fi - npm install --force --registry https://registry.npmmirror.com + # npm install --force --registry https://registry.npmmirror.com + npm install --registry https://registry.npmmirror.com echo -n "Building front-end vue ... " npm run build 1>/dev/null if [ $? = 0 ]; then echo "done" fi - git checkout ${feassetsdir} - git checkout ${felocalesdir} - git checkout ${feconstantsdir} - git checkout ${fehooksdir} + # git checkout ${feassetsdir} + # git checkout ${felocalesdir} + # git checkout ${feconstantsdir} + # git checkout ${fehooksdir} } makebe() { @@ -113,15 +114,23 @@ makebe() { ./build.sh ${be_args[@]} } +post_makepkg() { + cd ${builddir} + git checkout debbuild/DEBIAN/ + git checkout debbuild/22.04/DEBIAN/ +} + case "${m_arg}" in - fe) + "fe") makefe - ;; - all) + ;; + "all") makefe - makebe - ;; - be | *) - makebe - ;; + makebe + post_makepkg + ;; + "be" | "*") + makebe + post_makepkg + ;; esac \ No newline at end of file diff --git a/bin/nodejs.sh b/bin/nodejs.sh new file mode 100755 index 0000000..d40165a --- /dev/null +++ b/bin/nodejs.sh @@ -0,0 +1,5 @@ +# copy to /etc/profile.d/ to set the environment variables for all users +# cp -f nodejs.sh /etc/profile.d/99-nodejs.sh + +export PATH=/usr/local/bin:$PATH +export NODE_OPTIONS=--max-old-space-size=50000 \ No newline at end of file