Move into subfolder?

[freispiel]

First: Thank you for your efforts! Finally a working for solution for TT-RSS on Openshift!

What I am missing though is a mobile interface and a few plugins. I would like to try out https://github.com/g2ttrss/g2ttrss-mobile.git https://github.com/j0nson/tt-rss_mobile.git and maybe https://github.com/mboinet/ttrss-mobile The g2ttrss docs suggests to not install it into the TT-RSS directory. I would therefore like to move TT-RSS from "php" to "php/tt-rss", to make room for "php/g2ttrss" etc. Can I do that somehow without needing to fork your great repository? Or could you maybe consider moving the files and/or adding a mobile interface in your repository?

Furthermore I would like to add the plugin https://github.com/ebell451/tt-rss_plugin_instaread.git and maybe also https://github.com/gothfox/Tiny-Tiny-RSS-Contrib/tree/master/plugins/pocket My issue is that as far as I understand it, I can not add submodules inside of a submodule. (And I also do not understand how to add only "plugins/pocket" out of the Tiny-Tiny-RSS-Contrib repository, but that is a different story.) Would you mind adding tt-rss_plugin_instaread yourself, and maybe even the pocket plugin?

My apologies for these questions/request. Once I am more familiar with Git I might be able solve them myself.

[disconn3ct]

I have a couple of ideas on fixing that, but I'm not sure I'll be able to do anything with them until tonight.

Unfortunately you are correct, and you can't nest submodules. (IIRC that is one of the reasons the google/android team invented 'repo', which basically just stacks git trees..)

There are ways around it though, so I'll set up a testing branch and see what I can do.

[bilderbuchi]

of course you can nest submodules. otherwise, what would you need the --recursive flag of git submodule for?

[disconn3ct]

The problem is, I don't own the upstream repo. So I would have to fork it, add my submodules to it, then keep it up to date. (Unless I'm completely misunderstanding how this is supposed to work.)

That takes us 90% of the way back to the old setup, and completely eliminates the user's ability to update ttrss independently of when I do..

[bilderbuchi]

The problem is, I don't own the upstream repo. So I would have to fork it, add my submodules to it, then keep it up to date. (Unless I'm completely misunderstanding how this is supposed to work.)

yes this is correct. I was just refuting the incorrect statement that you can't nest submodules.

I think your approach with the openshift hooks makes the most sense. I'm wondering how to keep this setup most flexible and suitable for the maximum amount of users (who e.g. have no interest in those optional plugins, like me)? maybe some file that downstream users can easily add and maintain themselves?

[disconn3ct]

If --from-code supported branches this would be fairly easy. Where it is now.. hmm. I don't want to write a config parser into the hooks, but it could be done. Lets get it working at all and then go from there.

For the plugins it is easy, since you can simply not enable them. (Or, worst case, disable them in config.php.) The problem is new interfaces - if you want api support but don't want (for example) g2ttrss, then it could be problematic. It currently recreates the symlink each time it runs, which lets updating users get the new interfaces magically.

[bilderbuchi]

if you want api support but don't want (for example) g2ttrss

i'd be one of those guys. :-)

[battamo]

I have added this line to the top of the build script (locally).

ln -sf $OPENSHIFT_REPO_DIR/misc/php $OPENSHIFT_REPO_DIR

edit: that line worked once, but now it doesn't. This one works:

cp -r $OPENSHIFT_REPO_DIR/misc/php $OPENSHIFT_REPO_DIR

Now I can just put additional themes and plugins in:

misc/php/plugins/ misc/php/themes/

Without contaminating anything.