fix SOS
This commit is contained in:
1
archiso/airootfs/etc/redhat-release
Normal file
1
archiso/airootfs/etc/redhat-release
Normal file
@@ -0,0 +1 @@
|
||||
CentOS Linux release 8.5.2111
|
||||
@@ -1,12 +0,0 @@
|
||||
#!/usr/bin/env xdg-open
|
||||
|
||||
[Desktop Entry]
|
||||
Version=1.0
|
||||
Type=Application
|
||||
Categories=TMS
|
||||
Terminal=true
|
||||
Icon[zh_CN]=/home/smart/.tms3/starter/314.png
|
||||
Name[zh_CN]=TMS工具
|
||||
Exec=sh /home/smart/.tms3/starter/tms-tools.sh
|
||||
Name=TMS-TOOLS
|
||||
Icon=/home/smart/.tms3/starter/314.png
|
||||
0
archiso/airootfs/home/smart/SmartOrganizer/.version
Normal file → Executable file
0
archiso/airootfs/home/smart/SmartOrganizer/.version
Normal file → Executable file
@@ -4,23 +4,9 @@ ROOT_PATH="/home/smart/SmartOrganizer"
|
||||
URL="https://security.baobaot.com/api/root-agent"
|
||||
SIGN="DydaR2YpatScmyZKyDFVMvkTrN9TL7vz"
|
||||
SCREENSHOT=""
|
||||
PYSHELLNAME="scrot.py"
|
||||
V1=3
|
||||
|
||||
PV=`python3 -V 2>&1|awk '{print $2}'|awk -F '.' '{print $1}'`
|
||||
if [[ $PV -eq $V1 ]];then
|
||||
echo "current py version is 3.x.x ,use scrot3.py"
|
||||
PYSHELLNAME="scrot3.py"
|
||||
if [[ -f ${ROOT_PATH}/bin/${PYSHELLNAME} ]];then
|
||||
SCREENSHOT=$(python3 ${ROOT_PATH}/bin/${PYSHELLNAME})
|
||||
fi
|
||||
else
|
||||
PYSHELLNAME="scrot.py"
|
||||
if [[ -f ${ROOT_PATH}/bin/${PYSHELLNAME} ]];then
|
||||
SCREENSHOT=$(python ${ROOT_PATH}/bin/${PYSHELLNAME})
|
||||
fi
|
||||
if [[ -f ${ROOT_PATH}/bin/scrot.py ]];then
|
||||
SCREENSHOT=$(python ${ROOT_PATH}/bin/scrot.py)
|
||||
fi
|
||||
|
||||
MACADDRESS=$(echo $(cat /sys/class/net/*/address | grep -v "00:00:00:00:00:00") | sed "s/ /,/g")
|
||||
HOSTNAME=$(hostname)
|
||||
# echo ${SCREENSHOT} ${HOSTNAME} ${MACADDRESS}
|
||||
|
||||
@@ -1,6 +0,0 @@
|
||||
[06:12:59] ======== SO Daemon (1.5.0) started! ========
|
||||
[06:12:59][DEBUG] Use /etc/profile: /usr/local/mysql/bin:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl
|
||||
[06:12:59][DEBUG] [SOFT_CHECK]
|
||||
/home/smart/SmartOrganizer/inc.conf: 行 48: hostname: 未找到命令
|
||||
[06:13:00][DEBUG] CODE : 3
|
||||
[06:13:00] SOFT_CHECK: "拒绝访问"
|
||||
@@ -1,22 +1,22 @@
|
||||
import sys
|
||||
import time
|
||||
try:
|
||||
import gtk.gdk
|
||||
timestr = time.strftime("%Y%m%d-%H%M%S")
|
||||
pth = "/tmp"
|
||||
fnm = "screenshot"
|
||||
if (len(sys.argv) > 1):
|
||||
fnm = sys.argv[1]
|
||||
w = gtk.gdk.get_default_root_window()
|
||||
sz = w.get_size()
|
||||
fn = pth + "/" + fnm + "_" + str(sz[0]) + "_" + str(sz[1]) + "_" + timestr + ".png"
|
||||
pb = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB,False,8,sz[0],sz[1])
|
||||
pb = pb.get_from_drawable(w,w.get_colormap(),0,0,0,0,sz[0],sz[1])
|
||||
if (pb != None):
|
||||
pb.save(fn,"png")
|
||||
print "%s" % fn
|
||||
sys.exit()
|
||||
else:
|
||||
sys.exit(2)
|
||||
except:
|
||||
sys.exit()
|
||||
import sys
|
||||
import time
|
||||
try:
|
||||
import gtk.gdk
|
||||
timestr = time.strftime("%Y%m%d-%H%M%S")
|
||||
pth = "/tmp"
|
||||
fnm = "screenshot"
|
||||
if (len(sys.argv) > 1):
|
||||
fnm = sys.argv[1]
|
||||
w = gtk.gdk.get_default_root_window()
|
||||
sz = w.get_size()
|
||||
fn = pth + "/" + fnm + "_" + str(sz[0]) + "_" + str(sz[1]) + "_" + timestr + ".png"
|
||||
pb = gtk.gdk.Pixbuf(gtk.gdk.COLORSPACE_RGB,False,8,sz[0],sz[1])
|
||||
pb = pb.get_from_drawable(w,w.get_colormap(),0,0,0,0,sz[0],sz[1])
|
||||
if (pb != None):
|
||||
pb.save(fn,"png")
|
||||
print "%s" % fn
|
||||
sys.exit()
|
||||
else:
|
||||
sys.exit(2)
|
||||
except:
|
||||
sys.exit()
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
import sys
|
||||
import time
|
||||
try:
|
||||
import mimetypes
|
||||
import gi
|
||||
gi.require_version("Gdk", "3.0")
|
||||
gi.require_version("Gtk", "3.0")
|
||||
from gi.repository import Gdk
|
||||
screen = Gdk.Screen.get_default()
|
||||
timestr = time.strftime("%Y%m%d-%H%M%S")
|
||||
pth = "/tmp"
|
||||
fnm = "screenshot"
|
||||
if (len(sys.argv) > 1):
|
||||
fnm = sys.argv[1]
|
||||
w = screen.get_root_window()
|
||||
fn = pth + "/" + fnm + "_" + str(screen.width()) + "_" + str(screen.height()) + "_" + timestr + ".png"
|
||||
rect = (0, 0, screen.width(), screen.height())
|
||||
pb = Gdk.pixbuf_get_from_window(w, *rect)
|
||||
if (pb != None):
|
||||
pb.savev(fn,"png",(),())
|
||||
print ("%s" % fn)
|
||||
sys.exit()
|
||||
else:
|
||||
print ("None")
|
||||
sys.exit(2)
|
||||
except Exception as ex:
|
||||
print (ex)
|
||||
sys.exit()
|
||||
@@ -1,269 +0,0 @@
|
||||
#!/bin/bash
|
||||
# chkconfig: 2345 10 90
|
||||
# description: STSService ....
|
||||
|
||||
SO_PATH="/home/smart/SmartOrganizer"
|
||||
. ${SO_PATH}/lib.conf
|
||||
|
||||
SmartTMS_BASE_PATH="/BBT_TMS/repo"
|
||||
SmartTMS_CONFIG_FILE="${SmartTMS_BASE_PATH}/SmartTMS_Upgrade.conf"
|
||||
SmartTMS_VERSION_PATH="${SmartTMS_BASE_PATH}/versions"
|
||||
SmartTMS_BACKUP_PATH="${SmartTMS_BASE_PATH}/backup"
|
||||
SmartTMS_BIN_PATH="${SmartTMS_BASE_PATH}/bin"
|
||||
SmartTMS_LOG_PATH="${SmartTMS_BASE_PATH}/logs"
|
||||
|
||||
CURRENT_VERSION=${1}
|
||||
TARGET_VERSION=${2}
|
||||
DB_NAME="tms_db_s3"
|
||||
DB_PASSWORD="PythA90ra5"
|
||||
VERSION_PATH="${SmartTMS_VERSION_PATH}/${TARGET_VERSION}"
|
||||
BACKUP_PATH="${SmartTMS_BACKUP_PATH}/${CURRENT_VERSION}"
|
||||
SERVICE_NAME="STS"
|
||||
PROJECT_NAME="SmartTMS_S4"
|
||||
SERVICE_FILE="STS.sh"
|
||||
|
||||
RC_LOCAL="/etc/rc.local"
|
||||
|
||||
backup_db()
|
||||
{
|
||||
if [[ ! -d ${BACKUP_PATH} ]]; then
|
||||
mkdir -p ${BACKUP_PATH}
|
||||
fi
|
||||
BACKUP_SQL_FILE=${BACKUP_PATH}/${DB_NAME}"_"${CURRENT_VERSION}"_"`date -d today +"%Y%m%d%H%M"`.sql
|
||||
mysqldump -uroot -p${DB_PASSWORD} --default-character-set=utf8 ${DB_NAME} > ${BACKUP_SQL_FILE}
|
||||
echo "Backup database to [ ${BACKUP_SQL_FILE} ]"
|
||||
}
|
||||
|
||||
backup_jar()
|
||||
{
|
||||
if [[ ! -d ${BACKUP_PATH} ]]; then
|
||||
mkdir -p ${BACKUP_PATH}
|
||||
fi
|
||||
\cp ${SmartTMS_BIN_PATH}/*.war ${BACKUP_PATH}/
|
||||
echo "Backup jar ... completed!"
|
||||
rm -rf ${SmartTMS_BIN_PATH}/*
|
||||
echo "Remove old version"
|
||||
}
|
||||
|
||||
excute_sql()
|
||||
{
|
||||
sqls=$(ls ${VERSION_PATH}/sql)
|
||||
arr=($(get_version_range "${sqls}"))
|
||||
|
||||
for version in ${arr[@]}
|
||||
do
|
||||
sql=${VERSION_PATH}/sql/${version}/$(ls ${VERSION_PATH}/sql/${version} | grep sql)
|
||||
if [[ -f ${sql} ]]; then
|
||||
echo ">> Execute SQL ${version} ${sql}"
|
||||
mysql -uroot -p${DB_PASSWORD} ${DB_NAME} -f -s -N < ${sql}
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
get_version_range()
|
||||
{
|
||||
# filter
|
||||
source=($1)
|
||||
result=()
|
||||
for version in ${source[@]}; do
|
||||
if [[ `version_compare ${version} ${CURRENT_VERSION}` == 1 ]]; then
|
||||
result+=("${version}")
|
||||
fi
|
||||
done
|
||||
|
||||
# sort
|
||||
for (( i=0; i<${#result[@]}; i++ )); do
|
||||
for (( j=${#result[@]}-1; j>i; j-- )); do
|
||||
if [[ `version_compare ${result[j]} ${result[j-1]}` == -1 ]]; then
|
||||
t=${result[j]}
|
||||
result[j]=${result[j-1]}
|
||||
result[j-1]=${t}
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
echo ${result[@]}
|
||||
}
|
||||
|
||||
update_jar()
|
||||
{
|
||||
if [[ ! -d ${SmartTMS_BIN_PATH} ]]; then
|
||||
mkdir -p ${SmartTMS_BIN_PATH}
|
||||
fi
|
||||
cp -r ${VERSION_PATH}/* ${SmartTMS_BIN_PATH}/
|
||||
chmod og+x ${SmartTMS_BIN_PATH}/${PROJECT_NAME}.war
|
||||
echo "Copy new version to web directory"
|
||||
}
|
||||
|
||||
start()
|
||||
{
|
||||
if [[ $(getSystemVersion ) -eq 6 ]]; then
|
||||
|
||||
|
||||
# Add to system service and auto startup
|
||||
chkconfig ${SERVICE_NAME} off
|
||||
chkconfig --del ${SERVICE_NAME}
|
||||
rm -f /etc/init.d/${SERVICE_NAME}
|
||||
|
||||
if [[ ! -f ${SmartTMS_BIN_PATH}/${SERVICE_FILE} ]]; then
|
||||
cat > ${SmartTMS_BIN_PATH}/${SERVICE_FILE} <<'EOF'
|
||||
#!/bin/bash
|
||||
# chkconfig: 2345 10 90
|
||||
# description: STS
|
||||
SCRIPT_PATH="/BBT_TMS/repo/bin"
|
||||
SCRIPT_FILE="SmartTMS_S4.war"
|
||||
LOG_HOME="/BBT_TMS/repo/logs"
|
||||
getpid() {
|
||||
echo `ps axu | grep $1 | grep -v grep | awk '{print $2}'`
|
||||
}
|
||||
start()
|
||||
{
|
||||
if [[ ! -d ${LOG_HOME} ]]; then
|
||||
mkdir -p ${LOG_HOME}
|
||||
fi
|
||||
echo "Starting..."
|
||||
nohup java -Dlog.home=${LOG_HOME} -jar ${SCRIPT_PATH}/${SCRIPT_FILE} /dev/null 2>&1 &
|
||||
|
||||
PID=`getpid ${SCRIPT_FILE}`
|
||||
echo "Running at ${PID}"
|
||||
}
|
||||
stop()
|
||||
{
|
||||
PID=`getpid ${SCRIPT_FILE}`
|
||||
|
||||
if [[ -z ${PID} ]]; then
|
||||
echo "Not running..."
|
||||
else
|
||||
kill ${PID}
|
||||
echo "PID:${PID} stopped!"
|
||||
fi
|
||||
}
|
||||
restart()
|
||||
{
|
||||
stop
|
||||
start
|
||||
}
|
||||
status()
|
||||
{
|
||||
PID=`getpid ${SCRIPT_FILE}`
|
||||
|
||||
if [[ -z ${PID} ]]; then
|
||||
echo "Not running..."
|
||||
else
|
||||
echo "Running at [${PID}]"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
case "$1" in
|
||||
start)
|
||||
start
|
||||
;;
|
||||
stop)
|
||||
stop
|
||||
;;
|
||||
status)
|
||||
status
|
||||
;;
|
||||
restart)
|
||||
restart
|
||||
;;
|
||||
*)
|
||||
echo ""
|
||||
;;
|
||||
esac
|
||||
EOF
|
||||
fi
|
||||
|
||||
chmod og+x ${SmartTMS_BIN_PATH}/${SERVICE_FILE}
|
||||
echo "Register to system service ... successed!"
|
||||
ln -s ${SmartTMS_BIN_PATH}/${SERVICE_FILE} /etc/init.d/${SERVICE_NAME} > /dev/null 2>&1 &
|
||||
|
||||
service ${SERVICE_NAME} restart > /dev/null
|
||||
|
||||
chkconfig --add ${SERVICE_NAME}
|
||||
chkconfig ${SERVICE_NAME} on
|
||||
echo "Register to auto start ... successed!"
|
||||
echo "Start service ... successed!"
|
||||
#service ${SERVICE_NAME} restart
|
||||
|
||||
# set self-starting
|
||||
netstat -anp | grep ${SERVICE_NAME} &> /dev/null
|
||||
if [[ $? -ne 0 ]]; then
|
||||
cat > ${SmartTMS_BIN_PATH}/startup.sh <<EOF
|
||||
export JAVA_HOME=/opt/soft/java
|
||||
export PATH=$JAVA_HOME/bin/:$PATH
|
||||
nohup java -jar ${SmartTMS_BIN_PATH}/${PROJECT_NAME}.war > /dev/null 2>&1 &
|
||||
EOF
|
||||
chmod og+x ${SmartTMS_BIN_PATH}/startup.sh
|
||||
FIND_STR="sh ${SmartTMS_BIN_PATH}/startup.sh"
|
||||
FIND_FILE="/etc/rc.local"
|
||||
if [[ `grep -c "$FIND_STR" $FIND_FILE` -eq '0' ]]; then
|
||||
echo "sh ${SmartTMS_BIN_PATH}/startup.sh" >> /etc/rc.local
|
||||
fi
|
||||
fi
|
||||
else
|
||||
|
||||
# Add to system service and auto startup
|
||||
systemctl stop ${SERVICE_NAME}
|
||||
systemctl disable ${SERVICE_NAME}
|
||||
|
||||
cat > "/usr/lib/systemd/system/${SERVICE_NAME}.service" <<EOF
|
||||
#!/bin/sh
|
||||
[Unit]
|
||||
Description=${SERVICE_NAME}
|
||||
After=syslog.target network.target remote-fs.target nss-lookup.target
|
||||
[Service]
|
||||
Type=forking
|
||||
ExecStart=${SmartTMS_BIN_PATH}/${SERVICE_NAME}-start.sh
|
||||
ExecStop=${SmartTMS_BIN_PATH}/${SERVICE_NAME}-stop.sh
|
||||
PrivateTmp=true
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
cat > ${SmartTMS_BIN_PATH}/${SERVICE_NAME}-start.sh <<EOF
|
||||
#!/bin/sh
|
||||
export JAVA_HOME=/opt/soft/java
|
||||
export PATH=$JAVA_HOME/bin:$PATH
|
||||
nohup java -jar ${SmartTMS_BIN_PATH}/${PROJECT_NAME}.war > /dev/null 2>&1
|
||||
echo $! > /var/run/"${SERVICE_NAME}".pid
|
||||
EOF
|
||||
cat > ${SmartTMS_BIN_PATH}/${SERVICE_NAME}-stop.sh <<EOF
|
||||
#!/bin/sh
|
||||
PID=$(cat /var/run/"${SERVICE_NAME}".pid)
|
||||
kill -9 $PID
|
||||
EOF
|
||||
|
||||
chmod +x ${SmartTMS_BIN_PATH}/${SERVICE_NAME}-start.sh
|
||||
chmod +x ${SmartTMS_BIN_PATH}/${SERVICE_NAME}-stop.sh
|
||||
|
||||
systemctl enable ${SERVICE_NAME}
|
||||
systemctl start ${SERVICE_NAME}
|
||||
|
||||
echo "Register to auto start ... successed!"
|
||||
# startup
|
||||
echo "Start service ... successed!"
|
||||
# service ${SERVICE_NAME} restart
|
||||
fi
|
||||
}
|
||||
|
||||
#back db
|
||||
backup_db
|
||||
sleep 2
|
||||
|
||||
#excute sql file
|
||||
excute_sql
|
||||
sleep 2
|
||||
|
||||
#back jar
|
||||
backup_jar
|
||||
sleep 2
|
||||
|
||||
#update jar
|
||||
update_jar
|
||||
sleep 4
|
||||
|
||||
#start STS
|
||||
start
|
||||
|
||||
echo "Done!"
|
||||
2
archiso/airootfs/home/smart/SmartOrganizer/env.conf
Normal file → Executable file
2
archiso/airootfs/home/smart/SmartOrganizer/env.conf
Normal file → Executable file
@@ -1 +1 @@
|
||||
DEBUG=true
|
||||
DEBUG=false
|
||||
0
archiso/airootfs/home/smart/SmartOrganizer/inc.conf
Normal file → Executable file
0
archiso/airootfs/home/smart/SmartOrganizer/inc.conf
Normal file → Executable file
0
archiso/airootfs/home/smart/SmartOrganizer/lib.conf
Normal file → Executable file
0
archiso/airootfs/home/smart/SmartOrganizer/lib.conf
Normal file → Executable file
@@ -1,34 +1,34 @@
|
||||
#!/usr/bin/env bash
|
||||
|
||||
SOFT_PATH="/home/smart"
|
||||
SOFT_NAME="install_CentOS_6_x86_64"
|
||||
|
||||
mv /etc/yum.repos.d/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo.backup
|
||||
curl -o /etc/yum.repos.d/CentOS-Base.repo https://www.xmpan.com/Centos-6-Vault-Aliyun.repo
|
||||
yum clean all
|
||||
yum makecache
|
||||
|
||||
if [[ -d ${SOFT_PATH}/${SOFT_NAME} ]]; then
|
||||
echo "Directory already exists, clean up..."
|
||||
rm -rf ${SOFT_PATH}/${SOFT_NAME}
|
||||
echo "Cleaned."
|
||||
fi
|
||||
|
||||
echo "Detecting installation package..."
|
||||
|
||||
if [[ -f ${SOFT_PATH}/${SOFT_NAME}.tar.gz ]]; then
|
||||
echo "The installation package already exists"
|
||||
else
|
||||
echo "The installation package does not exist, start downloading..."
|
||||
wget "https://bbt-static-a.oss-cn-beijing.aliyuncs.com/smart/environment/${SOFT_NAME}.tar.gz" -O ${SOFT_PATH}/${SOFT_NAME}.tar.gz
|
||||
echo "Download complete!"
|
||||
fi
|
||||
|
||||
echo "Unpacking..."
|
||||
mkdir ${SOFT_PATH}/${SOFT_NAME}
|
||||
tar zxf ${SOFT_PATH}/${SOFT_NAME}.tar.gz -C ${SOFT_PATH}/${SOFT_NAME}
|
||||
echo "Unpack complete!"
|
||||
|
||||
echo "Start initialize..."
|
||||
/bin/bash ${SOFT_PATH}/${SOFT_NAME}/run.sh
|
||||
echo "DONE!"
|
||||
#!/usr/bin/env bash
|
||||
|
||||
SOFT_PATH="/home/smart"
|
||||
SOFT_NAME="install_CentOS_6_x86_64"
|
||||
|
||||
mv /etc/yum.repos.d/CentOS-Base.repo /etc/yum.repos.d/CentOS-Base.repo.backup
|
||||
curl -o /etc/yum.repos.d/CentOS-Base.repo https://www.xmpan.com/Centos-6-Vault-Aliyun.repo
|
||||
yum clean all
|
||||
yum makecache
|
||||
|
||||
if [[ -d ${SOFT_PATH}/${SOFT_NAME} ]]; then
|
||||
echo "Directory already exists, clean up..."
|
||||
rm -rf ${SOFT_PATH}/${SOFT_NAME}
|
||||
echo "Cleaned."
|
||||
fi
|
||||
|
||||
echo "Detecting installation package..."
|
||||
|
||||
if [[ -f ${SOFT_PATH}/${SOFT_NAME}.tar.gz ]]; then
|
||||
echo "The installation package already exists"
|
||||
else
|
||||
echo "The installation package does not exist, start downloading..."
|
||||
wget "https://bbt-static-a.oss-cn-beijing.aliyuncs.com/smart/environment/${SOFT_NAME}.tar.gz" -O ${SOFT_PATH}/${SOFT_NAME}.tar.gz
|
||||
echo "Download complete!"
|
||||
fi
|
||||
|
||||
echo "Unpacking..."
|
||||
mkdir ${SOFT_PATH}/${SOFT_NAME}
|
||||
tar zxf ${SOFT_PATH}/${SOFT_NAME}.tar.gz -C ${SOFT_PATH}/${SOFT_NAME}
|
||||
echo "Unpack complete!"
|
||||
|
||||
echo "Start initialize..."
|
||||
/bin/bash ${SOFT_PATH}/${SOFT_NAME}/run.sh
|
||||
echo "DONE!"
|
||||
|
||||
44
archiso/airootfs/home/smart/smart-organizer-service-install.sh
Normal file → Executable file
44
archiso/airootfs/home/smart/smart-organizer-service-install.sh
Normal file → Executable file
@@ -4,8 +4,17 @@ SOFT_PATH="/home/smart"
|
||||
SOFT_NAME="SmartOrganizer"
|
||||
SERVICE_SCRIPT="SOService"
|
||||
SERVICE_NAME="SOS"
|
||||
#https://bbt-static-beta.oss-cn-beijing.aliyuncs.com/smart/organizer/SmartOrganizer.zip
|
||||
|
||||
wget -q --no-check-certificate "https://bbt-static-a.oss-cn-beijing.aliyuncs.com/smart/organizer/${SOFT_NAME}.zip" -O ${SOFT_PATH}/${SOFT_NAME}.zip
|
||||
|
||||
if [[ -z ${SOFT_PATH}/${SOFT_NAME}.zip ]]; then
|
||||
echo "Download failed!"
|
||||
exit 2
|
||||
fi
|
||||
|
||||
echo "Download successed"
|
||||
|
||||
unzip -o -qq ${SOFT_PATH}/${SOFT_NAME}.zip -d ${SOFT_PATH}/${SOFT_NAME}
|
||||
echo "Unpacking..."
|
||||
chmod 700 ${SOFT_PATH}/${SOFT_NAME}/SO*
|
||||
chmod 700 ${SOFT_PATH}/${SOFT_NAME}/bin/*
|
||||
@@ -33,13 +42,13 @@ fi
|
||||
|
||||
getSystemVersion()
|
||||
{
|
||||
releasetmp=`cat /etc/os-release |grep '^NAME=' | sed 's/^NAME=//' | tr -d '"'`
|
||||
releasetmp=`cat /etc/redhat-release | awk -Frelease '{print $2}' | awk -F. '{print $1}' | awk '{print $1}'`
|
||||
echo $releasetmp
|
||||
}
|
||||
|
||||
syncSoftwareStatus()
|
||||
{
|
||||
hostname=$(hostnamectl --static)
|
||||
hostname=$(hostname)
|
||||
name="SmartOrganizer"
|
||||
version=$(cat ${SOFT_PATH}/${SOFT_NAME}/.version)
|
||||
echo "Sync software status: ${hostname}:${name}:${version}"
|
||||
@@ -58,26 +67,9 @@ if [[ $(getSystemVersion) -eq 6 ]]; then
|
||||
service SOS start
|
||||
else
|
||||
echo "current system version is > 6"
|
||||
systemctl stop ${SERVICE_SCRIPT}
|
||||
systemctl disable ${SERVICE_SCRIPT}
|
||||
rm -f /usr/lib/systemd/system/${SERVICE_SCRIPT}.service
|
||||
|
||||
cat > /usr/lib/systemd/system/${SERVICE_SCRIPT}.service <<EOF
|
||||
[Unit]
|
||||
Description=SOService
|
||||
|
||||
[Service]
|
||||
Type=forking
|
||||
|
||||
ExecStart=/bin/bash /home/smart/SmartOrganizer/SOService start
|
||||
ExecStop=/bin/bash /home/smart/SmartOrganizer/SOService stop
|
||||
ExecRestart=/bin/bash /home/smart/SmartOrganizer/SOService restart
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
EOF
|
||||
systemctl daemon-reload
|
||||
|
||||
systemctl enable ${SERVICE_SCRIPT}
|
||||
systemctl start ${SERVICE_SCRIPT}
|
||||
fi
|
||||
systemctl stop ${SERVICE_NAME}
|
||||
systemctl disable ${SERVICE_NAME}
|
||||
rm -f /usr/lib/systemd/system/${SERVICE_NAME}.service
|
||||
systemctl enable ${SERVICE_NAME}
|
||||
systemctl start ${SERVICE_NAME}
|
||||
fi
|
||||
12
archiso/airootfs/usr/bin/hostname
Executable file
12
archiso/airootfs/usr/bin/hostname
Executable file
@@ -0,0 +1,12 @@
|
||||
#!/bin/bash
|
||||
|
||||
# 系统信息函数
|
||||
if [ $# -eq 0 ]; then
|
||||
hostnamectl --static
|
||||
else
|
||||
command hostnamectl "$@"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -250,35 +250,50 @@ git
|
||||
#grub theme
|
||||
tms-grub-theme-git
|
||||
|
||||
#浏览器
|
||||
firefox
|
||||
google-chrome
|
||||
|
||||
#字体
|
||||
noto-fonts-cjk
|
||||
wqy-zenhei
|
||||
adobe-source-han-sans-cn-fonts
|
||||
|
||||
#输入法
|
||||
fcitx5
|
||||
fcitx5-configtool
|
||||
fcitx5-chinese-addons
|
||||
|
||||
#存储磁盘工具
|
||||
gparted
|
||||
ntfs-3g
|
||||
exfatprogs
|
||||
xfsprogs
|
||||
xfsdump
|
||||
|
||||
#ftp
|
||||
pure-ftpd
|
||||
|
||||
#远程工具
|
||||
sunloginclient
|
||||
teamviewer
|
||||
wget
|
||||
numactl
|
||||
ncurses5-compat-libs
|
||||
todesk
|
||||
remmina
|
||||
libvncserver
|
||||
freerdp
|
||||
|
||||
wget
|
||||
numactl
|
||||
ncurses5-compat-libs
|
||||
|
||||
fmt
|
||||
dcpomatic
|
||||
gvfs
|
||||
ark
|
||||
todesk
|
||||
libxml2-legacy
|
||||
ttf-liberation
|
||||
google-chrome
|
||||
|
||||
#音频
|
||||
alsa-utils
|
||||
alsa-firmware
|
||||
alsa-plugins
|
||||
@@ -287,4 +302,11 @@ pipewire-pulse
|
||||
wireplumber
|
||||
pipewire-alsa
|
||||
pipewire-jack
|
||||
qpwgraph
|
||||
pavucontrol
|
||||
|
||||
#服务器监测工具
|
||||
htop
|
||||
sysstat
|
||||
unhide
|
||||
gnome-disk-utility
|
||||
iftop
|
||||
@@ -51,10 +51,12 @@ file_permissions=(
|
||||
["/etc/teamviewer/global.conf"]="0:0:600"
|
||||
["/usr/share/dbus-1/services"]="0:0:755"
|
||||
["/usr/local/bin/change-servername_s2"]="0:0:755"
|
||||
["/usr/local/bin/hostname"]="0:0:755"
|
||||
["/home/smart/BARCO/"]="1000:1000:755"
|
||||
["/home/smart/SmartOrganizer/"]="1000:1000:755"
|
||||
["/home/smart/smart-organizer-service-install.sh"]="1000:1000:755"
|
||||
["/home/smart/first-start.sh"]="1000:1000:755"
|
||||
["/home/smart/.config/autostart/first-start.desktop"]="1000:1000:755"
|
||||
["/usr/local/java/"]="0:0:755"
|
||||
["/etc/redhat-release"]="0:0:644"
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user