Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
V
vMap
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Open source
vMap
Commits
09369e7a
Commit
09369e7a
authored
Oct 18, 2018
by
Armand Bahi
Browse files
Options
Downloads
Patches
Plain Diff
Modify symlinks strategy
parent
b8263ffb
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitignore
+3
-14
3 additions, 14 deletions
.gitignore
utils/init_symlinks.sh
+47
-27
47 additions, 27 deletions
utils/init_symlinks.sh
with
50 additions
and
41 deletions
.gitignore
+
3
−
14
View file @
09369e7a
client
vas/
vas
client/
conf/closure
conf/closure
conf/node_modules/
conf/node_modules/
conf/properties.json
conf/properties.json
src/closure/conf/depswriter/
src/closure/
src/vitis/vas/log/
src/vitis/vas/public/
src/vitis/vas/server/
src/vitis/vas/ws_data/
src/vitis/vas/tmp/
src/vitis/client/modules/
! src/vitis/client/modules/vitis/
src/vitis/vas/rest/ws/*
! src/vitis/vas/rest/ws/vitis/
src/vitis/vas/sql/*
! src/vitis/vas/sql/sqlQueries.xml
This diff is collapsed.
Click to expand it.
utils/init_symlinks.sh
+
47
−
27
View file @
09369e7a
...
@@ -19,20 +19,56 @@ read APP_EXISTING_PATH
...
@@ -19,20 +19,56 @@ read APP_EXISTING_PATH
cd
..
cd
..
# Supprime les anciens symlinks
if
[
-d
"client"
]
;
then
rm
-Rf
client
fi
if
[
-d
"vas"
]
;
then
rm
-Rf
vas
fi
find src/vitis/client
-type
l
-delete
find src/vitis/vas/sql
-type
l
-delete
find src/vitis/vas/rest
-type
l
-delete
# Vitis
# Vitis
echo
"---- Link vitis ----"
echo
"---- Link vitis ----"
if
!
[
-e
"
$(
pwd
)
/client"
]
;
then
if
!
[
-e
"
$(
pwd
)
/client"
]
;
then
echo
"---- Link vitis 2 ----"
ln
-rsf
src/vitis/client client
mkdir
client
mkdir
client/javascript
mkdir
client/modules
ln
-rsf
src/vitis/client/css client/css
ln
-rsf
src/vitis/client/forms client/forms
ln
-rsf
src/vitis/client/images client/images
ln
-rsf
src/vitis/client/javascript/app client/javascript/app
ln
-rsf
src/vitis/client/javascript/externs client/javascript/externs
ln
-rsf
src/vitis/client/javascript/require client/javascript/require
ln
-rsf
src/vitis/client/lang client/lang
ln
-rsf
src/vitis/client/less client/less
ln
-rsf
src/vitis/client/modules/vitis client/modules/vitis
ln
-rsf
src/vitis/client/templates client/templates
ln
-rsf
src/vitis/client/.htaccess client/.htaccess
ln
-rsf
src/vitis/client/index.html client/index.html
fi
fi
if
!
[
-e
"
$(
pwd
)
/vas"
]
;
then
if
!
[
-e
"
$(
pwd
)
/vas"
]
;
then
ln
-rsf
src/vitis/vas vas
mkdir
vas
mkdir
vas/rest
mkdir
vas/rest/ws
ln
-rsf
src/vitis/vas/doc vas/doc
ln
-rsf
src/vitis/vas/rest/class vas/rest/class
ln
-rsf
src/vitis/vas/rest/inc vas/rest/inc
ln
-rsf
src/vitis/vas/rest/ws/vitis vas/rest/ws/vitis
ln
-rsf
src/vitis/vas/rest/index.phtml vas/rest/index.phtml
ln
-rsf
src/vitis/vas/rest/index.vhtml vas/rest/index.vhtml
ln
-rsf
src/vitis/vas/sql vas/sql
ln
-rsf
src/vitis/vas/util vas/util
fi
fi
# Conf
# Conf
echo
"---- Link conf ----"
echo
"---- Link conf ----"
if
!
[
-e
"src/vitis/client/conf"
]
;
then
if
!
[
-e
"src/vitis/client/conf"
]
;
then
ln
-rsf
conf
src/vitis/
client/conf
ln
-rsf
conf client/conf
fi
fi
if
!
[
-e
"conf/closure"
]
;
then
if
!
[
-e
"conf/closure"
]
;
then
ln
-rsf
src/closure/conf conf/closure
ln
-rsf
src/closure/conf conf/closure
...
@@ -47,22 +83,17 @@ if [[ $depsCount > 0 ]]; then
...
@@ -47,22 +83,17 @@ if [[ $depsCount > 0 ]]; then
echo
"---- Link module_
${
module
}
----"
echo
"---- Link module_
${
module
}
----"
if
[
-d
"
$(
pwd
)
/src/module_
${
module
}
/module"
]
;
then
if
[
-d
"
$(
pwd
)
/src/module_
${
module
}
/module"
]
;
then
if
!
[
-e
"src/vitis/client/modules/
${
module
}
"
]
;
then
if
!
[
-e
"src/vitis/client/modules/
${
module
}
"
]
;
then
ln
-rsf
src/module_
${
module
}
/module
src/vitis/
client/modules/
${
module
}
ln
-rsf
src/module_
${
module
}
/module client/modules/
${
module
}
fi
fi
fi
fi
if
[
-d
"
$(
pwd
)
/src/module_
${
module
}
/web_service/ws"
]
;
then
if
[
-d
"
$(
pwd
)
/src/module_
${
module
}
/web_service/ws"
]
;
then
if
!
[
-e
"src/vitis/vas/rest/ws/
${
module
}
"
]
;
then
if
!
[
-e
"src/vitis/vas/rest/ws/
${
module
}
"
]
;
then
ln
-rsf
src/module_
${
module
}
/web_service/ws src/vitis/vas/rest/ws/
${
module
}
ln
-rsf
src/module_
${
module
}
/web_service/ws vas/rest/ws/
${
module
}
fi
fi
if
[
-d
"
$(
pwd
)
/src/module_
${
module
}
/web_service/conf"
]
;
then
if
!
[
-e
"src/vitis/vas/rest/conf/
${
module
}
"
]
;
then
ln
-rsf
src/module_
${
module
}
/web_service/conf src/vitis/vas/rest/conf/
${
module
}
fi
fi
fi
fi
if
[
-d
"
$(
pwd
)
/src/module_
${
module
}
/web_service/sql"
]
;
then
if
[
-d
"
$(
pwd
)
/src/module_
${
module
}
/web_service/sql"
]
;
then
if
!
[
-e
"src/vitis/vas/sql/
${
module
}
"
]
;
then
if
!
[
-e
"src/vitis/vas/sql/
${
module
}
"
]
;
then
ln
-rsf
src/module_
${
module
}
/web_service/sql
src/vitis/
vas/sql/
${
module
}
ln
-rsf
src/module_
${
module
}
/web_service/sql vas/sql/
${
module
}
fi
fi
fi
fi
if
[
-d
"
$(
pwd
)
/src/module_
${
module
}
/web_service/class"
]
;
then
if
[
-d
"
$(
pwd
)
/src/module_
${
module
}
/web_service/class"
]
;
then
...
@@ -70,7 +101,7 @@ if [[ $depsCount > 0 ]]; then
...
@@ -70,7 +101,7 @@ if [[ $depsCount > 0 ]]; then
if
[
-d
"
$(
pwd
)
/src/module_
${
module
}
/web_service/class/
${
class_dir
}
"
]
;
then
if
[
-d
"
$(
pwd
)
/src/module_
${
module
}
/web_service/class/
${
class_dir
}
"
]
;
then
echo
"---- Link module_
${
module
}
/
${
class_dir
}
----"
echo
"---- Link module_
${
module
}
/
${
class_dir
}
----"
if
!
[
-e
"src/vitis/vas/rest/class/
${
class_dir
}
"
]
;
then
if
!
[
-e
"src/vitis/vas/rest/class/
${
class_dir
}
"
]
;
then
ln
-rsf
src/module_
${
module
}
/web_service/class/
${
class_dir
}
src/vitis/
vas/rest/class/
${
class_dir
}
ln
-rsf
src/module_
${
module
}
/web_service/class/
${
class_dir
}
vas/rest/class/
${
class_dir
}
fi
fi
fi
fi
done
done
...
@@ -84,6 +115,7 @@ if [[ $depsCount > 0 ]]; then
...
@@ -84,6 +115,7 @@ if [[ $depsCount > 0 ]]; then
echo
"---- Link exixting app
${
APP_EXISTING_PATH
}
----"
echo
"---- Link exixting app
${
APP_EXISTING_PATH
}
----"
declare
-a
existing_folders_path
=(
"vas/server"
declare
-a
existing_folders_path
=(
"vas/server"
"vas/rest/conf"
"vas/log"
"vas/log"
"vas/public"
"vas/public"
"vas/shared"
"vas/shared"
...
@@ -99,11 +131,6 @@ if [[ $depsCount > 0 ]]; then
...
@@ -99,11 +131,6 @@ if [[ $depsCount > 0 ]]; then
done
done
declare
-a
existing_files_path
=(
"client/conf/properties.json"
declare
-a
existing_files_path
=(
"client/conf/properties.json"
"vas/rest/conf/properties.inc"
"vas/rest/conf/properties_domain.inc"
"vas/rest/conf/properties_post.inc"
"vas/rest/conf/properties_server.inc"
"vas/rest/conf/version.inc"
"vas/rest/.htaccess"
)
"vas/rest/.htaccess"
)
for
file_path
in
"
${
existing_files_path
[@]
}
"
;
do
for
file_path
in
"
${
existing_files_path
[@]
}
"
;
do
if
[
-f
"
${
APP_EXISTING_PATH
}
/
$file_path
"
]
;
then
if
[
-f
"
${
APP_EXISTING_PATH
}
/
$file_path
"
]
;
then
...
@@ -114,15 +141,8 @@ if [[ $depsCount > 0 ]]; then
...
@@ -114,15 +141,8 @@ if [[ $depsCount > 0 ]]; then
for
properties_dir
in
$(
ls
"
${
APP_EXISTING_PATH
}
/vas/rest/conf"
)
;
do
for
properties_dir
in
$(
ls
"
${
APP_EXISTING_PATH
}
/vas/rest/conf"
)
;
do
if
[
-d
"
${
APP_EXISTING_PATH
}
/vas/rest/conf/
${
properties_dir
}
"
]
;
then
if
[
-d
"
${
APP_EXISTING_PATH
}
/vas/rest/conf/
${
properties_dir
}
"
]
;
then
if
[
-d
"
$(
pwd
)
/vas/rest/conf/
${
properties_dir
}
"
]
;
then
echo
"copy
${
APP_EXISTING_PATH
}
/vas/rest/conf/
${
properties_dir
}
/ >
$(
pwd
)
/vas/rest/conf/"
for
properties_file
in
$(
ls
"
${
APP_EXISTING_PATH
}
/vas/rest/conf/
${
properties_dir
}
"
)
;
do
cp
-Rf
"
${
APP_EXISTING_PATH
}
/vas/rest/conf/
${
properties_dir
}
/"
"
$(
pwd
)
/vas/rest/conf/"
# if [ ${properties_file:0:10}=="properties" || ${properties_file}=="version.inc" ]; then
if
[[
$properties_file
==
"properties"
*
]]
||
[[
$properties_file
==
"version.inc"
]]
;
then
echo
"copy vas/rest/conf/
${
properties_dir
}
/
${
properties_file
}
"
cp
-f
"
${
APP_EXISTING_PATH
}
/vas/rest/conf/
${
properties_dir
}
/
${
properties_file
}
"
"
$(
pwd
)
/vas/rest/conf/
${
properties_dir
}
/
${
properties_file
}
"
fi
done
fi
fi
fi
done
done
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment