executing manually instead of using datapatch on Oracle 12c on Windows

Hello, Please I am having problems running datapach, so I need to run it manually.
In a document says: "Run catbundle.sql manually as we do for pre-12.1 bundles."

In oracle 11g for windows I ran 
@?\Bundle\PatchNo\catwinbundle.sql
currently there is not such file in 12c for patch 12.0.1.1

First question is:
I have to run only this to update the patch on windows?
?\RDBMS\ADMIN\catbundle.sql

Second question is:
If I ran un upgrade is necessary to run the script on 12c too as it was on 11g?

Thank you.