-
Notifications
You must be signed in to change notification settings - Fork 2.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add the apps-external directory during setup only #34898
Conversation
|
tested with occ maintenance:install ^ |
Codecov Report
@@ Coverage Diff @@
## master #34898 +/- ##
============================================
- Coverage 65.35% 65.34% -0.01%
- Complexity 18488 18492 +4
============================================
Files 1208 1208
Lines 69975 69982 +7
Branches 1280 1280
============================================
- Hits 45732 45730 -2
- Misses 23871 23880 +9
Partials 372 372
Continue to review full report at Codecov.
|
01fb3f0
to
304aaf1
Compare
Command line installation - OK
Making an existing apps-external owned by root (=no write access to www-data) - OK |
forgot to say that in my setup the setup goes through but the folder "apps-external" doesn't get created, because the |
I fixed the issue, tested it, squashed and pushed, see my test from above. |
ah ok, didn't see the update. thanks |
|
||
// create the apps-external directory only during installation | ||
$appsExternalDir = \OC::$SERVERROOT.'/apps-external'; | ||
if (!\file_exists($appsExternalDir)) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
seems we already do is_dir
for existence check and mkdir
in the block below, so this one here feel redundant ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I just did the same as we do for the data directory to stay inline.
I can of course drop the if statement and just do @mkdir. Just le me know.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah ok, fine then. it only happens once at setup time, so not a big issue
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍
@mmattel please backport |
Backport |
Description
apps-external
directory only during installation but not as before as part of the tar.Removing the changes made in Makefile,
Removing the physically created apps-external directory
Adopting the code in Setup.php
Related Issue
([Feature Request] make the apps-external folder default used in new installations)
Motivation and Context
Prevents re-adding that directory on every update.
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist:
Open tasks: