Skip to content

Commit a3cc9ae

Browse files
edhongcyedhongcy
authored
Merge pull request #37 from qnap-dev/feature/new-config-option
feat: new config option by hero model
2 parents f1eaf3b + 7f12e98 commit a3cc9ae

File tree

5 files changed

+112
-24
lines changed

5 files changed

+112
-24
lines changed

‎qpkg.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
QPKG_NAME="QDK"
2-
QPKG_VER="2.3.13"
2+
QPKG_VER="2.3.14"
33
QPKG_AUTHOR="micke"
44
QPKG_LICENSE="GPLv2+"
55
QPKG_SUMMARY="QDK (QPKG Development Kit) is used to create QPKG packages."

‎shared/qdk.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
QDK_VERSION=2.3.13
1+
QDK_VERSION=2.3.14
22
QDK_PATH_P=`pwd | awk 'BEGIN { FS = "QDK" } ; { print $1 }'`
33
QDK_PATH="${QDK_PATH_P}/QDK"

‎shared/scripts/code_signing.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
QPKG_NAME="QDK"
2-
QPKG_VER="2.3.13"
2+
QPKG_VER="2.3.14"
33
QNAP_CODE_SIGNING_SERVER_IP=codesigning.qnap.com.tw
44
QNAP_CODE_SIGNING_SERVER_PORT=5001

‎shared/scripts/qinstall.sh‎

Lines changed: 87 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# A QPKG installation script for QDK
77
#
8-
# QDK V.2.3.13
8+
# QDK V.2.3.14
99
#
1010
# Copyright (C) 2009,2010 QNAP Systems, Inc.
1111
# Copyright (C) 2010,2011 Michael Nordstrom
@@ -110,6 +110,17 @@ SYS_QPKG_CONF_FIELD_CONTAINER="Container"
110110
SYS_QPKG_CONF_FIELD_EXEC_FILES="Exec_Files"
111111
SYS_QPKG_CONF_FIELD_FW_VER_MIN="FW_Ver_Min"
112112
SYS_QPKG_CONF_FIELD_FW_VER_MAX="FW_Ver_Max"
113+
SYS_QPKG_CONF_FIELD_MOUNT_ACTION="Mount_Action"
114+
SYS_QPKG_CONF_FIELD_UNMOUNT_ACTION="Unmount_Action"
115+
SYS_QPKG_CONF_FIELD_SHARE_ADD_ACTION="Share_Add_Action"
116+
SYS_QPKG_CONF_FIELD_SHARE_DEL_ACTION="Share_Del_Action"
117+
SYS_QPKG_CONF_FIELD_ENTER_READDELETE_ACTION="Enter_ReadDelete_Action"
118+
SYS_QPKG_CONF_FIELD_LEAVE_READDELETE_ACTION="Leave_ReadDelete_Action"
119+
SYS_QPKG_CONF_FIELD_ACTION_TIMEOUT="Action_Timeout"
120+
SYS_QPKG_CONF_FIELD_ENTER_HERO_LOW_SPACE="Enter_Hero_Low_space"
121+
SYS_QPKG_CONF_FIELD_LEAVE_HERO_LOW_SPACE="Leave_Hero_Low_space"
122+
SYS_QPKG_CONF_FIELD_ENTER_HERO_CRITICAL_LOW="Enter_Hero_Critical_Low"
123+
SYS_QPKG_CONF_FIELD_LEAVE_HERO_CRITICAL_LOW="Leave_Hero_Critical_Low"
113124
PREFIX="App Center"
114125
# The following variables are assigned values at run-time.
115126
SYS_HOSTNAME=$($CMD_HOSTNAME)
@@ -816,7 +827,71 @@ set_qpkg_fw_ver_max(){
816827
set_qpkg_field $SYS_QPKG_CONF_FIELD_FW_VER_MAX "$QTS_MAX_VERSION"
817828
fi
818829
}
830+
set_qpkg_mount_action(){
831+
if [ -n "$QPKG_MOUNT_ACTION" ]; then
832+
set_qpkg_field $SYS_QPKG_CONF_FIELD_MOUNT_ACTION "$QPKG_MOUNT_ACTION"
833+
fi
834+
}
835+
836+
set_qpkg_unmount_action(){
837+
if [ -n "$QPKG_UNMOUNT_ACTION" ]; then
838+
set_qpkg_field $SYS_QPKG_CONF_FIELD_UNMOUNT_ACTION "$QPKG_UNMOUNT_ACTION"
839+
fi
840+
}
841+
842+
set_qpkg_share_add_action(){
843+
if [ -n "$QPKG_SHARE_ADD_ACTION" ]; then
844+
set_qpkg_field $SYS_QPKG_CONF_FIELD_SHARE_ADD_ACTION "$QPKG_SHARE_ADD_ACTION"
845+
fi
846+
}
847+
848+
set_qpkg_share_del_action(){
849+
if [ -n "$QPKG_SHARE_DEL_ACTION" ]; then
850+
set_qpkg_field $SYS_QPKG_CONF_FIELD_SHARE_DEL_ACTION "$QPKG_SHARE_DEL_ACTION"
851+
fi
852+
}
853+
854+
set_qpkg_enter_readdelete_action(){
855+
if [ -n "$QPKG_ENTER_READDELETE_ACTION" ]; then
856+
set_qpkg_field $SYS_QPKG_CONF_FIELD_ENTER_READDELETE_ACTION "$QPKG_ENTER_READDELETE_ACTION"
857+
fi
858+
}
859+
860+
set_qpkg_leave_readdelete_action(){
861+
if [ -n "$QPKG_LEAVE_READDELETE_ACTION" ]; then
862+
set_qpkg_field $SYS_QPKG_CONF_FIELD_LEAVE_READDELETE_ACTION "$QPKG_LEAVE_READDELETE_ACTION"
863+
fi
864+
}
865+
866+
set_qpkg_action_timeout(){
867+
if [ -n "$QPKG_ACTION_TIMEOUT" ]; then
868+
set_qpkg_field $SYS_QPKG_CONF_FIELD_ACTION_TIMEOUT "$QPKG_ACTION_TIMEOUT"
869+
fi
870+
}
871+
872+
set_qpkg_enter_hero_low_space(){
873+
if [ -n "$QPKG_ENTER_HERO_LOW_SPACE_ACTION" ]; then
874+
set_qpkg_field $SYS_QPKG_CONF_FIELD_ENTER_HERO_LOW_SPACE "$QPKG_ENTER_HERO_LOW_SPACE_ACTION"
875+
fi
876+
}
819877

878+
set_qpkg_leave_hero_low_space(){
879+
if [ -n "$QPKG_LEAVE_HERO_LOW_SPACE_ACTION" ]; then
880+
set_qpkg_field $SYS_QPKG_CONF_FIELD_LEAVE_HERO_LOW_SPACE "$QPKG_LEAVE_HERO_LOW_SPACE_ACTION"
881+
fi
882+
}
883+
884+
set_qpkg_enter_hero_critical_low(){
885+
if [ -n "$QPKG_ENTER_HERO_CRITICAL_LOW_ACTION" ]; then
886+
set_qpkg_field $SYS_QPKG_CONF_FIELD_ENTER_HERO_CRITICAL_LOW "$QPKG_ENTER_HERO_CRITICAL_LOW_ACTION"
887+
fi
888+
}
889+
890+
set_qpkg_leave_hero_critical_low(){
891+
if [ -n "$QPKG_LEAVE_HERO_CRITICAL_LOW_ACTION" ]; then
892+
set_qpkg_field $SYS_QPKG_CONF_FIELD_LEAVE_HERO_CRITICAL_LOW "$QPKG_LEAVE_HERO_CRITICAL_LOW_ACTION"
893+
fi
894+
}
820895

821896
############################################################
822897
# Store the current status of the QPKG to be able to
@@ -860,6 +935,17 @@ register_qpkg(){
860935
set_qpkg_exec_file
861936
set_qpkg_fw_ver_min
862937
set_qpkg_fw_ver_max
938+
set_qpkg_mount_action
939+
set_qpkg_unmount_action
940+
set_qpkg_share_add_action
941+
set_qpkg_share_del_action
942+
set_qpkg_enter_readdelete_action
943+
set_qpkg_leave_readdelete_action
944+
set_qpkg_action_timeout
945+
set_qpkg_enter_hero_low_space
946+
set_qpkg_leave_hero_low_space
947+
set_qpkg_enter_hero_critical_low
948+
set_qpkg_leave_hero_critical_low
863949
}
864950

865951
##################

‎shared/template/qpkg.cfg‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -75,26 +75,28 @@ QTS_MINI_VERSION="4.1.0"
7575
# 1: administrators, 2: all NAS users, 3(default): No limit
7676
#QPKG_FORCE_VISIBLE="3"
7777

78-
# Location of icons for the packaged application.
79-
#QDK_DATA_DIR_ICONS="icons"
80-
# Location of files specific to arm-x19 packages.
81-
#QDK_DATA_DIR_X19="arm-x19"
82-
# Location of files specific to arm-x31 packages.
83-
#QDK_DATA_DIR_X31="arm-x31"
84-
# Location of files specific to arm-x41 packages.
85-
#QDK_DATA_DIR_X41="arm_al"
86-
# Location of files specific to x86 packages.
87-
#QDK_DATA_DIR_X86="x86"
88-
# Location of files specific to x86 (64-bit) packages.
89-
#QDK_DATA_DIR_X86_64="x86_64"
90-
# Location of files common to all architectures.
91-
#QDK_DATA_DIR_SHARED="shared"
92-
# Location of configuration files.
93-
#QDK_DATA_DIR_CONFIG="config"
94-
# Name of local data package.
95-
#QDK_DATA_FILE=""
96-
# Name of extra package (multiple definitions are allowed).
97-
#QDK_EXTRA_FILE=""
78+
# Storage share folder add/delete action
79+
#QPKG_SHARE_ADD_ACTION=""
80+
#QPKG_SHARE_DEL_ACTION=""
81+
82+
# Storage mount/unmount action
83+
#QPKG_MOUNT_ACTION=""
84+
#QPKG_UNMOUNT_ACTION=""
85+
86+
# Register action volume status into read delete or read only mode
87+
#QPKG_ENTER_READDELETE_ACTION=""
88+
#QPKG_LEAVE_READDELETE_ACTION=""
89+
90+
# For Hero FW 5.2.x
91+
#QPKG_ENTER_HERO_LOW_SPACE_ACTION=""
92+
#QPKG_LEAVE_HERO_LOW_SPACE_ACTION=""
93+
94+
#QPKG_ENTER_HERO_CRITICAL_LOW_ACTION=""
95+
#QPKG_LEAVE_HERO_CRITICAL_LOW_ACTION=""
96+
97+
# Default timeout is 15 sec, if without this option
98+
#QPKG_ACTION_TIMEOUT=""
99+
98100
# For QNAP code signing (currently can be done only inside QNAP)
99101
# Uncomment the following four options if you want to enable code signing for this QPKG
100102
#QNAP_CODE_SIGNING="0"

0 commit comments

Comments
 (0)