From e77658c53bdf09c7ddf842e9bc2a6ee98ee8f1f4 Mon Sep 17 00:00:00 2001
From: zhang_xubo <2578876417@qq.com>
Date: Sat, 12 Mar 2022 19:20:06 +0800
Subject: [PATCH] Fixed ease of use issues

---
 opengauss-bashprofile |  4 +---
 opengauss-server.spec | 32 ++++++++++++++++++++++++--------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/opengauss-bashprofile b/opengauss-bashprofile
index b224447..0d44355 100644
--- a/opengauss-bashprofile
+++ b/opengauss-bashprofile
@@ -1,7 +1,5 @@
-[ -f /etc/profile ] && source /etc/profile
-
 export GAUSSHOME=/usr/local/opengauss/
 export LD_LIBRARY_PATH=/usr/local/opengauss/lib:$LD_LIBRARY_PATH
 export PATH=/usr/local/opengauss/bin:$PATH
 export PGDATA=/var/lib/opengauss/data
-export PORT=7654
\ No newline at end of file
+export PORT=7654
diff --git a/opengauss-server.spec b/opengauss-server.spec
index d453708..f414ffd 100755
--- a/opengauss-server.spec
+++ b/opengauss-server.spec
@@ -12,7 +12,7 @@
 
 Name:           opengauss
 Version:        2.1.0
-Release:        4
+Release:        5
 Summary:        openGauss is an open source relational database management system
 License:        MulanPSL-2.0 and MIT and BSD and zlib and TCL and Apache-2.0 and BSL-1.0
 URL:            https://gitee.com/opengauss/openGauss-server
@@ -184,15 +184,28 @@ install -m 644 %{SOURCE6} %{buildroot}/%{apppath}/script/opengauss.service
 install -m 700 %{SOURCE7} %{buildroot}/%{apppath}/script/autostart.sh
 
 %pre
-/usr/sbin/groupadd -g 39 -o -r opengauss >/dev/null 2>&1 || :
-/usr/sbin/useradd -M -N -g opengauss -o -r -d %{datapath} -s /bin/bash \
-        -c "openGauss Server" -u 39 opengauss >/dev/null 2>&1 || :
+/usr/sbin/groupadd opengauss >/dev/null 2>&1 || :
+/usr/sbin/useradd -M -N -g opengauss -d %{datapath} -s /bin/bash \
+        -c "openGauss Server" opengauss >/dev/null 2>&1 || :
+
+# for install step
+if [ $1 = 1 ]; then
+    portinfo=$(lsof -i:%{port})
+    if [ "${portinfo}" != "" ]; then
+        echo "The port[%{port}] is occupied. Please use command 'lsof -i:%{port} to check it.'"
+        exit 1
+    fi
+fi
 
 %post
 # set opengauss mini config parameters
 set_mini_configparam(){
     config_mini_file=%{apppath}/share/postgresql/opengauss_config_file_mini
+
+    # set guc parameters
     echo "port = %{port}" >> ${config_mini_file}
+    echo "synchronous_commit = off" >> ${config_mini_file}
+    echo "listen_addresses = '127.0.0.1'" >> ${config_mini_file}
 
     config_sample_file=%{apppath}/share/postgresql/postgresql.conf.sample
     if [[ -f $config_mini_file ]]
@@ -227,13 +240,13 @@ start_opengauss(){
         return 0
     fi
 
-    result=`su - opengauss -c "source ~/.bash_profile; gs_initdb -D /var/lib/opengauss/data -U opengauss --nodename=single_node"`
+    result=`su - opengauss -c "source /var/lib/opengauss/.bash_profile; gs_initdb -D /var/lib/opengauss/data -U opengauss --nodename=single_node"`
     if [ $? -ne 0 ]; then
         echo "Init openGauss database failed."
         echo $result
     else
         echo "Init openGauss database success."
-        result=`su - opengauss -c "source ~/.bash_profile; gs_ctl start -D /var/lib/opengauss/data"`
+        result=`su - opengauss -c "source /var/lib/opengauss/.bash_profile; gs_ctl start -D /var/lib/opengauss/data"`
         if [ $? -ne 0 ]; then
             echo "Start openGauss database failed."
             echo $result
@@ -264,7 +277,7 @@ remove_service(){
     fi
 }
 clear_database(){
-    pid=$(ps -ef | grep /var/lib/opengauss/data | grep -v grep | awk '{print $2}')
+    pid=$(ps -ef | grep /usr/local/opengauss/bin/gaussdb | grep -v grep | awk '{print $2}')
     if [ "$pid" != "" ]; then
         kill -9 $pid
     fi
@@ -288,7 +301,10 @@ fi
 
 
 %changelog
-* Thur Jan 27 2022 zhangxubo <zhangxubo1@huawei.com> - 2.1.0-4
+* Sat Mar 12 2022 zhangxubo <zhangxubo1@huawei.com> - 2.1.0-5
+- Fix bugs: #I4VDYQ #I4V624 #I4UOUU #I4TCDB #I4TCB8
+
+* Thu Jan 27 2022 zhangxubo <zhangxubo1@huawei.com> - 2.1.0-4
 - Fix bugs: #I4SDWX
 
 * Sat Jan 22 2022 zhangxubo <zhangxubo1@huawei.com> - 2.1.0-3
-- 
Gitee