nas/pkgscripts-ng
1
0
Fork 0
mirror of https://github.com/SynologyOpenSource/pkgscripts-ng.git synced 2025-07-25 17:10:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix repository name and description generation in INFO

Browse Source
This commit is contained in:
zyli
2020-11-04 14:20:16 +08:00
parent 49063bbd4d
commit 8a59774000
2 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -10,7 +10,7 @@ You can download and set up pre-built environments by using **EnvDeploy** as fol
If -p is not given, all available platforms for given version will be set up.
```
cd /toolkit/pkgscripts
cd /toolkit/pkgscripts-ng
./EnvDeploy -v 7.0 -p avoton # for example
```
@ -19,7 +19,7 @@ and **ds.avoton-7.0** is the chroot environment to build your own projects.
```
toolkit/
├── pkgscripts/
├── pkgscripts-ng/
└── build_env/
├── ...
   └── ds.avoton-7.0/

20
include/pkg_util.sh
View File

@ -15,8 +15,8 @@ pkg_log() {
pkg_get_platform() {
local arch=
declare -f AskPlatform &>/dev/null || . /pkgscripts/include/platforms
declare -f AskPlatform &>/dev/null || . /pkgscripts/include/check
declare -f AskPlatform &>/dev/null || . /pkgscripts-ng/include/platforms
declare -f AskPlatform &>/dev/null || . /pkgscripts-ng/include/check
declare -f AskPlatform &>/dev/null || return 1
local abbr=$(AskPlatform && echo $PLATFORM_ABBR)
@ -79,7 +79,7 @@ plat_to_family() {
;;
*)
echo "Failed to get platform family for $family" 1>&2
echo "Please add the mapping information into pkgscripts/pkg_util.sh:pkg_get_platform_family" 1>&2
echo "Please add the mapping information into pkgscripts-ng/include/pkg_util.sh:pkg_get_platform_family" 1>&2
return 1
esac
echo "$family"
@ -170,13 +170,14 @@ check_necessary_field() {
}
pkg_dump_info() {
local langs="enu cht chs krn ger fre ita spn jpn dan nor sve nld rus plk ptb ptg hun trk csy"
local fields="package version maintainer maintainer_url distributor distributor_url arch exclude_arch model exclude_model
adminprotocol adminurl adminport firmware dsmuidir dsmappname dsmapppage dsmapplaunchname checkport allow_altport
startable helpurl report_url support_center install_reboot install_dep_packages install_conflict_packages install_dep_services
instuninst_restart_services startstop_restart_services start_dep_services silent_install silent_upgrade silent_uninstall install_type
checksum package_icon package_icon_120 package_icon_128 package_icon_144 package_icon_256 thirdparty support_conf_folder
auto_upgrade_from offline_install precheckstartstop os_min_ver os_max_ver beta ctl_stop ctl_install ctl_uninstall
install_break_packages install_replace_packages use_deprecated_replace_mechanism"
install_break_packages install_replace_packages use_deprecated_replace_mechanism description displayname"
local f=
for f in $fields; do
@ -184,6 +185,17 @@ pkg_dump_info() {
echo $f=\"${!f}\"
fi
done
for lang in $langs; do
description="description_${lang}"
if [ -n "${!description}" ]; then
echo "${description}=\"${!description}\""
fi
displayname="displayname_${lang}"
if [ -n "${!displayname}" ]; then
echo "${displayname}=\"${!displayname}\""
fi
done
}
pkg_make_package() { # <source path> <dest path>