Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
osticket
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
docker
osticket
Commits
cff8db8d
Commit
cff8db8d
authored
11 years ago
by
Jared Hancock
Browse files
Options
Downloads
Patches
Plain Diff
Don't refer to class Misc in deploy scripts
parent
a7f4b811
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
setup/cli/modules/deploy.php
+2
-2
2 additions, 2 deletions
setup/cli/modules/deploy.php
setup/cli/modules/unpack.php
+5
-1
5 additions, 1 deletion
setup/cli/modules/unpack.php
with
7 additions
and
3 deletions
setup/cli/modules/deploy.php
+
2
−
2
View file @
cff8db8d
...
@@ -35,7 +35,7 @@ class Deployment extends Unpacker {
...
@@ -35,7 +35,7 @@ class Deployment extends Unpacker {
if
(
is_file
(
$start
.
'/main.inc.php'
))
break
;
if
(
is_file
(
$start
.
'/main.inc.php'
))
break
;
$start
.
=
'/..'
;
$start
.
=
'/..'
;
}
}
return
Misc
::
realpath
(
$start
);
return
self
::
realpath
(
$start
);
}
}
/**
/**
...
@@ -92,7 +92,7 @@ class Deployment extends Unpacker {
...
@@ -92,7 +92,7 @@ class Deployment extends Unpacker {
if
(
!
is_dir
(
$this
->
destination
))
if
(
!
is_dir
(
$this
->
destination
))
if
(
!@
mkdir
(
$this
->
destination
,
0751
,
true
))
if
(
!@
mkdir
(
$this
->
destination
,
0751
,
true
))
die
(
"Destination path does not exist and cannot be created"
);
die
(
"Destination path does not exist and cannot be created"
);
$this
->
destination
=
Misc
::
realpath
(
$this
->
destination
)
.
'/'
;
$this
->
destination
=
self
::
realpath
(
$this
->
destination
)
.
'/'
;
# Determine if this is an upgrade, and if so, where the include/
# Determine if this is an upgrade, and if so, where the include/
# folder is currently located
# folder is currently located
...
...
This diff is collapsed.
Click to expand it.
setup/cli/modules/unpack.php
+
5
−
1
View file @
cff8db8d
...
@@ -34,6 +34,10 @@ class Unpacker extends Module {
...
@@ -34,6 +34,10 @@ class Unpacker extends Module {
main installation path."
,
main installation path."
,
);
);
function
realpath
(
$path
)
{
return
(
$p
=
realpath
(
$path
))
?
$p
:
$path
;
}
function
find_upload_folder
()
{
function
find_upload_folder
()
{
# Hop up to the root folder
# Hop up to the root folder
$start
=
dirname
(
__file__
);
$start
=
dirname
(
__file__
);
...
@@ -41,7 +45,7 @@ class Unpacker extends Module {
...
@@ -41,7 +45,7 @@ class Unpacker extends Module {
if
(
is_dir
(
$start
.
'/upload'
))
break
;
if
(
is_dir
(
$start
.
'/upload'
))
break
;
$start
.
=
'/..'
;
$start
.
=
'/..'
;
}
}
return
Misc
::
realpath
(
$start
.
'/upload'
);
return
self
::
realpath
(
$start
.
'/upload'
);
}
}
function
change_include_dir
(
$include_path
)
{
function
change_include_dir
(
$include_path
)
{
...
...
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