From 01dcddd636c38996547fe3af30fe8b0ed2d8fb28 Mon Sep 17 00:00:00 2001 From: fumingwei Date: Sat, 11 Sep 2021 17:12:20 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:=E4=BF=AE=E6=94=B9tsg-diagose-oneshot?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E4=BB=A5=E5=90=8E=E6=B2=A1=E6=9C=89=E6=9D=83?= =?UTF-8?q?=E9=99=90=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 1 + cmake/Package.cmake | 4 ++-- cmake/PostInstall.in | 4 ++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 808ab90..e5650be 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,6 +63,7 @@ feature_branch_build: TESTING_VERSION_BUILD: 1 extends: .build_rpm script: + - ls -halt ./scripts - ./ci/travis.sh dependencies: - images_build diff --git a/cmake/Package.cmake b/cmake/Package.cmake index 1c70c10..efe3bc2 100644 --- a/cmake/Package.cmake +++ b/cmake/Package.cmake @@ -28,8 +28,8 @@ install(FILES service/tsg-diagnose-periodical.service DESTINATION /usr/lib/syste install(FILES service/tsg-diagnose.conf DESTINATION /usr/lib/tmpfiles.d) install(FILES images_build/server_dns/dnsmasq.conf DESTINATION /opt/tsg/tsg-diagnose/etc/) install(DIRECTORY images/ DESTINATION ./images) -install(FILES scripts/tsg-diagnose-periodical DESTINATION ./scripts) -install(FILES scripts/tsg-diagnose-oneshot DESTINATION ./scripts) +install(FILES scripts/tsg-diagnose-periodical DESTINATION ./scripts/) +install(FILES scripts/tsg-diagnose-oneshot DESTINATION ./scripts/) install(FILES scripts/tsg-diagnose.sh DESTINATION /etc/profile.d/) install(DIRECTORY etc/certs_import/ DESTINATION ./etc/.certs_import) diff --git a/cmake/PostInstall.in b/cmake/PostInstall.in index b56d117..7a484d7 100644 --- a/cmake/PostInstall.in +++ b/cmake/PostInstall.in @@ -7,3 +7,7 @@ fi docker load < /opt/tsg/tsg-diagnose/images/server_web.tar docker load < /opt/tsg/tsg-diagnose/images/client.tar docker load < /opt/tsg/tsg-diagnose/images/server_dns.tar +chmod 0755 /opt/tsg/tsg-diagnose/etc/.certs_import/certs/tool +chmod 0755 /opt/tsg/tsg-diagnose/scripts/tsg-diagnose-oneshot +chmod 0755 /opt/tsg/tsg-diagnose/scripts/tsg-diagnose-periodical +chmod 0755 /etc/profile.d/tsg-diagnose.sh