Merge pull request #3338 from taosdata/feature/sangshuduo/snap

Feature/sangshuduo/snap

snap/hooks/install

@@ -5,7 +5,9 @@ if [ ! -d /var/lib/taos ]; then
 fi
 
 if [ ! -d /var/log/taos ]; then
-  mkdir -p -m777 /var/log/taos
+  mkdir -p --mode=777 /var/log/taos
+else
+  chmod 777 /var/log/taos
 fi
 
 if [ ! -d /etc/taos ]; then
@@ -13,5 +15,8 @@ if [ ! -d /etc/taos ]; then
 fi
 
 if [ ! -f /etc/taos/taos.cfg ]; then
+  if [ ! -d /etc/taos ]; then
+    mkdir -p /etc/taos
+  fi
   cp $SNAP/etc/taos/taos.cfg /etc/taos/taos.cfg
 fi

snap/local/launcher.sh

@@ -15,11 +15,12 @@ case "$SNAP_USER_COMMON" in
 	*)                             COMMON=$SNAP_USER_COMMON ;;
 esac
 
-if [ -d /etc/taos ]; then
-    CONFIG_FILE="/etc/taos"
-else
-    CONFIG_FILE="$SNAP/etc/taos"
+if [ ! -f $SNAP_DATA/etc/taos/taos.cfg ]; then
+  if [ ! -d $SNAP_DATA/etc/taos ]; then
+    mkdir -p $SNAP_DATA/etc/taos
+  fi
+  cp $SNAP/etc/taos/taos.cfg $SNAP_DATA/etc/taos
 fi
 
 # Launch the snap
-$SNAP/usr/bin/taosd -c $CONFIG_FILE $@
+$SNAP/usr/bin/taosd -c /etc/taos $@

snap/snapcraft.yaml

@@ -1,13 +1,13 @@
 name: tdengine
 base: core18 # the base snap is the execution environment for this snap
-version: '2.0.0.6' # just for humans, typically '1.2+git' or '1.3.2'
+version: '2.0.2.0' # just for humans, typically '1.2+git' or '1.3.2'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
   TDengine is an open-source big data platform designed and optimized for Internet of Things (IoT), Connected Vehicles, and Industrial IoT. Besides the 10x faster time-series database, it provides caching, stream computing, message queuing and other functionalities to reduce the complexity and costs of development and operations.
 
 grade: stable
-confinement: classic
+confinement: strict
 
 apps:
   tdengine:
@@ -24,7 +24,9 @@ apps:
     command: taoswrapper.sh
     plugs:
       - network
+      - system-observe
       - systemfiles
+      - historyfile
 
   taosdemo:
     command: usr/bin/taosdemo
@@ -32,11 +34,19 @@ apps:
       - network
 
 plugs:
+  historyfile:
+    interface: personal-files
+    read:
+      - $HOME/.taos_history
+    write:
+      - $HOME/.taos_history
+
   systemfiles:
     interface: system-files
     read:
       - /etc/taos
       - /var/lib/taos
+      - /var/log/taos
       - /tmp
     write:
       - /var/log/taos
@@ -77,7 +87,7 @@ parts:
         mkdir -p $SNAPCRAFT_STAGE/var/lib/taos
       fi
       if [ ! -d $SNAPCRAFT_STAGE/var/log/taos ]; then
-        mkdir -p $SNAPCRAFT_STAGE/var/log/taos
+        mkdir -p --mode=777 $SNAPCRAFT_STAGE/var/log/taos
       fi
 
     prime:
@@ -85,16 +95,16 @@ parts:
       - usr/bin/taosd
       - usr/bin/taos
       - usr/bin/taosdemo
-      - usr/lib/libtaos.so.2.0.0.6
+      - usr/lib/libtaos.so.2.0.2.0
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so
 
     override-prime: |
       snapcraftctl prime
-      if [ ! -d $SNAPCRAFT_STAGE/var/lib/taos ]; then
+      if [ ! -d $SNAPCRAFT_PRIME/var/lib/taos ]; then
         cp -rf $SNAPCRAFT_STAGE/var/lib/taos $SNAPCRAFT_PRIME
       fi
-      if [ ! -d $SNAPCRAFT_STAGE/var/log/taos ]; then
+      if [ ! -d $SNAPCRAFT_PRIME/var/log/taos ]; then
         cp -rf  $SNAPCRAFT_STAGE/var/log/taos $SNAPCRAFT_PRIME
       fi
 
@@ -103,11 +113,10 @@ layout:
     bind: $SNAP_DATA/var/lib/taos
   /var/log/taos:
     bind: $SNAP_DATA/var/log/taos
-  /etc/taos/taos.cfg:
-    bind-file: $SNAP_DATA/etc/taos/taos.cfg
+  /etc/taos:
+    bind: $SNAP_DATA/etc/taos
 
 
 hooks:
   install:
-    plugs: [systemfiles]
-
+    plugs: [systemfiles, historyfile]